Mercurial > hg > release > icedtea8-forest-3.0 > jdk
changeset 11694:ce5c56e0676f
8140543: Arrange font actions
Reviewed-by: prr, srl, mschoene
author | vadim |
---|---|
date | Fri, 30 Oct 2015 10:59:05 +0300 |
parents | 02f8fe1d8f9f |
children | 941474f247d2 |
files | src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp src/share/native/sun/font/layout/IndicRearrangementProcessor.h src/share/native/sun/font/layout/IndicRearrangementProcessor2.cpp src/share/native/sun/font/layout/IndicRearrangementProcessor2.h |
diffstat | 4 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp Thu Oct 29 17:30:03 2015 -0700 +++ b/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp Fri Oct 30 10:59:05 2015 +0300 @@ -76,11 +76,11 @@ } if (flags & irfMarkFirst) { - firstGlyph = (le_uint32)currGlyph; + firstGlyph = currGlyph; } if (flags & irfMarkLast) { - lastGlyph = (le_uint32)currGlyph; + lastGlyph = currGlyph; } doRearrangementAction(glyphStorage, (IndicRearrangementVerb) (flags & irfVerbMask), success); @@ -118,7 +118,7 @@ if (firstGlyph == lastGlyph) break; if (firstGlyph + 1 < firstGlyph) { success = LE_INDEX_OUT_OF_BOUNDS_ERROR; - break; + break; } a = glyphStorage[firstGlyph]; ia = glyphStorage.getCharIndex(firstGlyph, success);
--- a/src/share/native/sun/font/layout/IndicRearrangementProcessor.h Thu Oct 29 17:30:03 2015 -0700 +++ b/src/share/native/sun/font/layout/IndicRearrangementProcessor.h Fri Oct 30 10:59:05 2015 +0300 @@ -76,8 +76,8 @@ static UClassID getStaticClassID(); protected: - le_uint32 firstGlyph; - le_uint32 lastGlyph; + le_int32 firstGlyph; + le_int32 lastGlyph; LEReferenceTo<IndicRearrangementSubtableHeader> indicRearrangementSubtableHeader; LEReferenceToArrayOf<IndicRearrangementStateEntry> entryTable;
--- a/src/share/native/sun/font/layout/IndicRearrangementProcessor2.cpp Thu Oct 29 17:30:03 2015 -0700 +++ b/src/share/native/sun/font/layout/IndicRearrangementProcessor2.cpp Fri Oct 30 10:59:05 2015 +0300 @@ -74,11 +74,11 @@ } if (flags & irfMarkFirst) { - firstGlyph = (le_uint32)currGlyph; + firstGlyph = currGlyph; } if (flags & irfMarkLast) { - lastGlyph = (le_uint32)currGlyph; + lastGlyph = currGlyph; } doRearrangementAction(glyphStorage, (IndicRearrangementVerb) (flags & irfVerbMask), success); @@ -115,7 +115,7 @@ if (firstGlyph == lastGlyph) break; if (firstGlyph + 1 < firstGlyph) { success = LE_INDEX_OUT_OF_BOUNDS_ERROR; - break; + break; } a = glyphStorage[firstGlyph]; ia = glyphStorage.getCharIndex(firstGlyph, success);
--- a/src/share/native/sun/font/layout/IndicRearrangementProcessor2.h Thu Oct 29 17:30:03 2015 -0700 +++ b/src/share/native/sun/font/layout/IndicRearrangementProcessor2.h Fri Oct 30 10:59:05 2015 +0300 @@ -76,8 +76,8 @@ static UClassID getStaticClassID(); protected: - le_uint32 firstGlyph; - le_uint32 lastGlyph; + le_int32 firstGlyph; + le_int32 lastGlyph; LEReferenceToArrayOf<IndicRearrangementStateEntry2> entryTable; LEReferenceTo<IndicRearrangementSubtableHeader2> indicRearrangementSubtableHeader;