process reviewer comments: start == str

check on 0 char not needed anymore
openjdk · Jun 12, 2020 · 998f55c · 998f55c
1 parent d345c74
commit 998f55c
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/PangoGlyphLayout.java b/modules/javafx.graphics/src/main/java/com/sun/javafx/font/freetype/PangoGlyphLayout.java
@@ -86,9 +86,6 @@ private boolean check(long checkValue, String message, long context, long desc,
 
     private Map<TextRun, Long> runUtf8 = new HashMap<>();
     public void layout(TextRun run, PGFont font, FontStrike strike, char[] text) {
-        for (char c: text) {
-            if (c == 0) c = '\f';
-        }
         /* Create the pango font and attribute list */
         FontResource fr = font.getFontResource();
         boolean composite = fr instanceof CompositeFontResource;
@@ -143,10 +140,9 @@ public void layout(TextRun run, PGFont font, FontStrike strike, char[] text) {
         }
 
         /* Itemize */
-        long start = OSPango.g_utf8_offset_to_pointer(str, run.getStart());
         long utflen = OSPango.g_utf8_strlen(str,-1);
         long end = OSPango.g_utf8_offset_to_pointer(str, utflen);
-        long runs = OSPango.pango_itemize(context, str, (int)(start - str), (int)(end - start), attrList, 0);
+        long runs = OSPango.pango_itemize(context, str, 0, (int)(end - str), attrList, 0);
 
         if (runs != 0) {
             /* Shape all PangoItem into PangoGlyphString */