Mercurial > hg > release > icedtea7-forest-2.5 > jdk
changeset 8171:bd878677c43e
8067699: Better glyph storage
Reviewed-by: prr
author | bae |
---|---|
date | Fri, 16 Jan 2015 23:36:58 +0400 |
parents | 0c077928c05c |
children | 43d49ef06848 |
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 Fri Jan 16 23:29:51 2015 +0400 +++ b/src/share/native/sun/font/layout/LigatureSubstProc.cpp Fri Jan 16 23:36:58 2015 +0400 @@ -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 Fri Jan 16 23:29:51 2015 +0400 +++ b/src/share/native/sun/font/layout/LigatureSubstProc2.cpp Fri Jan 16 23:36:58 2015 +0400 @@ -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