changeset 10629:0f3413e0bb06

8067699: Better glyph storage Reviewed-by: srl, bae, mschoene
author prr
date Thu, 15 Jan 2015 09:50:52 -0800
parents ac97b69b88e3
children c407e143c5a6
files src/share/native/sun/font/layout/LigatureSubstProc.cpp src/share/native/sun/font/layout/LigatureSubstProc2.cpp
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/native/sun/font/layout/LigatureSubstProc.cpp	Thu Apr 09 13:24:42 2015 -0700
+++ b/src/share/native/sun/font/layout/LigatureSubstProc.cpp	Thu Jan 15 09:50:52 2015 -0800
@@ -115,7 +115,7 @@
                   LE_DEBUG_BAD_FONT("off end of ligature substitution header");
                   return newState; // get out! bad font
               }
-              if(componentGlyph > glyphStorage.getGlyphCount()) {
+              if(componentGlyph >= glyphStorage.getGlyphCount()) {
                 LE_DEBUG_BAD_FONT("preposterous componentGlyph");
                 currGlyph++;
                 return newState; // get out! bad font
--- a/src/share/native/sun/font/layout/LigatureSubstProc2.cpp	Thu Apr 09 13:24:42 2015 -0700
+++ b/src/share/native/sun/font/layout/LigatureSubstProc2.cpp	Thu Jan 15 09:50:52 2015 -0800
@@ -119,7 +119,7 @@
 
             offset = action & lafComponentOffsetMask;
             if (offset != 0) {
-                if(componentGlyph > glyphStorage.getGlyphCount()) {
+                if(componentGlyph >= glyphStorage.getGlyphCount()) {
                   LE_DEBUG_BAD_FONT("preposterous componentGlyph");
                   currGlyph+= dir;
                   return nextStateIndex; // get out! bad font