OpenJDK / jdk-updates / jdk12u
changeset 29911:b2a9675e2e21
8067699: Better glyph storage
Reviewed-by: srl, bae, mschoene
| author | prr |
|---|---|
| date | Thu, 15 Jan 2015 09:47:06 -0800 |
| parents | 6691760b847e |
| children | 4478c08657e0 |
| files | jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.cpp jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.cpp Wed Jan 07 13:10:00 2015 -0800 +++ b/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc.cpp Thu Jan 15 09:47:06 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/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp Wed Jan 07 13:10:00 2015 -0800 +++ b/jdk/src/java.desktop/share/native/libfontmanager/layout/LigatureSubstProc2.cpp Thu Jan 15 09:47:06 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