stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8140543: Arrange font actions

Browse Source 
Reviewed-by: prr, srl, mschoene
This commit is contained in:
Vadim Pakhnushev 2015-10-26 23:41:41 +03:00
parent 11af905b18
commit f03a55be9e
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.cpp
View File

@ -76,11 +76,11 @@ ByteOffset IndicRearrangementProcessor::processStateEntry(LEGlyphStorage &glyphS
} }
if (flags & irfMarkFirst) { if (flags & irfMarkFirst) {
firstGlyph = (le_uint32)currGlyph; firstGlyph = currGlyph;
} }
if (flags & irfMarkLast) { if (flags & irfMarkLast) {
lastGlyph = (le_uint32)currGlyph; lastGlyph = currGlyph;
} }
doRearrangementAction(glyphStorage, (IndicRearrangementVerb) (flags & irfVerbMask), success); doRearrangementAction(glyphStorage, (IndicRearrangementVerb) (flags & irfVerbMask), success);
@ -118,7 +118,7 @@ void IndicRearrangementProcessor::doRearrangementAction(LEGlyphStorage &glyphSto
if (firstGlyph == lastGlyph) break; if (firstGlyph == lastGlyph) break;
if (firstGlyph + 1 < firstGlyph) { if (firstGlyph + 1 < firstGlyph) {
success = LE_INDEX_OUT_OF_BOUNDS_ERROR; success = LE_INDEX_OUT_OF_BOUNDS_ERROR;
break; break;
} }
a = glyphStorage[firstGlyph]; a = glyphStorage[firstGlyph];
ia = glyphStorage.getCharIndex(firstGlyph, success); ia = glyphStorage.getCharIndex(firstGlyph, success);

4
jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor.h
View File

@ -76,8 +76,8 @@ public:
static UClassID getStaticClassID(); static UClassID getStaticClassID();
protected: protected:
le_uint32 firstGlyph; le_int32 firstGlyph;
le_uint32 lastGlyph; le_int32 lastGlyph;
LEReferenceTo<IndicRearrangementSubtableHeader> indicRearrangementSubtableHeader; LEReferenceTo<IndicRearrangementSubtableHeader> indicRearrangementSubtableHeader;
LEReferenceToArrayOf<IndicRearrangementStateEntry> entryTable; LEReferenceToArrayOf<IndicRearrangementStateEntry> entryTable;

6
jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.cpp
View File

@ -74,11 +74,11 @@ le_uint16 IndicRearrangementProcessor2::processStateEntry(LEGlyphStorage &glyphS
} }
if (flags & irfMarkFirst) { if (flags & irfMarkFirst) {
firstGlyph = (le_uint32)currGlyph; firstGlyph = currGlyph;
} }
if (flags & irfMarkLast) { if (flags & irfMarkLast) {
lastGlyph = (le_uint32)currGlyph; lastGlyph = currGlyph;
} }
doRearrangementAction(glyphStorage, (IndicRearrangementVerb) (flags & irfVerbMask), success); doRearrangementAction(glyphStorage, (IndicRearrangementVerb) (flags & irfVerbMask), success);
@ -115,7 +115,7 @@ void IndicRearrangementProcessor2::doRearrangementAction(LEGlyphStorage &glyphSt
if (firstGlyph == lastGlyph) break; if (firstGlyph == lastGlyph) break;
if (firstGlyph + 1 < firstGlyph) { if (firstGlyph + 1 < firstGlyph) {
success = LE_INDEX_OUT_OF_BOUNDS_ERROR; success = LE_INDEX_OUT_OF_BOUNDS_ERROR;
break; break;
} }
a = glyphStorage[firstGlyph]; a = glyphStorage[firstGlyph];
ia = glyphStorage.getCharIndex(firstGlyph, success); ia = glyphStorage.getCharIndex(firstGlyph, success);

4
jdk/src/java.desktop/share/native/libfontmanager/layout/IndicRearrangementProcessor2.h
View File

@ -76,8 +76,8 @@ public:
static UClassID getStaticClassID(); static UClassID getStaticClassID();
protected: protected:
le_uint32 firstGlyph; le_int32 firstGlyph;
le_uint32 lastGlyph; le_int32 lastGlyph;
LEReferenceToArrayOf<IndicRearrangementStateEntry2> entryTable; LEReferenceToArrayOf<IndicRearrangementStateEntry2> entryTable;
LEReferenceTo<IndicRearrangementSubtableHeader2> indicRearrangementSubtableHeader; LEReferenceTo<IndicRearrangementSubtableHeader2> indicRearrangementSubtableHeader;