Merge pull request #1421 from gritGmbH/bugfix/last-font-symbol-unreac…

…hable Make last glyph of font reachable for point rendering
deegree · Dec 14, 2022 · a62d0fd · a62d0fd
2 parents f98c91f + 17a9817
commit a62d0fd
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 7 deletions.
diff --git a/...test/resources/org/deegree/rendering/r2d/similaritytests/render_scene_point.png b/...test/resources/org/deegree/rendering/r2d/similaritytests/render_scene_point.png
diff --git a/...ng-2d/src/test/resources/org/deegree/rendering/r2d/similaritytests/render_scene_point.xml b/...ng-2d/src/test/resources/org/deegree/rendering/r2d/similaritytests/render_scene_point.xml
@@ -67,8 +67,6 @@
 			</Graphic>
 		</PointSymbolizer>
 	</Rule>
-	<!-- DISABLED FONT INDEX ISSUE -->
-	<!--
 	<Rule>
 		<ogc:Filter>
 			<ogc:PropertyIsEqualTo>
@@ -95,7 +93,6 @@
 			</Graphic>
 		</PointSymbolizer>
 	</Rule>
-	-->
 	<Rule>
 		<ogc:Filter>
 			<ogc:PropertyIsEqualTo>

diff --git a/...st/resources/org/deegree/rendering/r2d/similaritytests/render_scene_strokes.png b/...st/resources/org/deegree/rendering/r2d/similaritytests/render_scene_strokes.png
diff --git a/...-2d/src/test/resources/org/deegree/rendering/r2d/similaritytests/render_scene_strokes.xml b/...-2d/src/test/resources/org/deegree/rendering/r2d/similaritytests/render_scene_strokes.xml
@@ -134,8 +134,6 @@
 			</Stroke>
 		</LineSymbolizer>
 	</Rule>
-	<!-- DISABLED FONT INDEX ISSUE -->
-	<!--
 	<Rule>
 		<ogc:Filter>
 			<ogc:PropertyIsEqualTo>
@@ -167,5 +165,4 @@
 			</Stroke>
 		</LineSymbolizer>
 	</Rule>
-	-->
 </FeatureTypeStyle>
diff --git a/.../deegree-core-style/src/main/java/org/deegree/style/se/parser/GraphicSymbologyParser.java b/.../deegree-core-style/src/main/java/org/deegree/style/se/parser/GraphicSymbologyParser.java
@@ -302,7 +302,7 @@ private Pair<Mark, Continuation<Mark>> parseMark( XMLStreamReader in )
                                 break sym;
                             }
 
-                            if ( font != null && base.markIndex >= font.getNumGlyphs() - 1 ) {
+                            if ( font != null && base.markIndex >= font.getNumGlyphs() ) {
                                 LOG.warn( "The font only contains {} glyphs, but the index given was {}.",
                                           font.getNumGlyphs(), base.markIndex );
                                 break sym;