Merge
diff --git a/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp b/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp
index 15bca38..5598349 100644
--- a/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp
+++ b/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp
@@ -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);
diff --git a/src/share/native/sun/font/layout/IndicRearrangementProcessor.h b/src/share/native/sun/font/layout/IndicRearrangementProcessor.h
index 36af0ff..42d7a24 100644
--- a/src/share/native/sun/font/layout/IndicRearrangementProcessor.h
+++ b/src/share/native/sun/font/layout/IndicRearrangementProcessor.h
@@ -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;
diff --git a/src/share/native/sun/font/layout/IndicRearrangementProcessor2.cpp b/src/share/native/sun/font/layout/IndicRearrangementProcessor2.cpp
index 2a94c10..8692312 100644
--- a/src/share/native/sun/font/layout/IndicRearrangementProcessor2.cpp
+++ b/src/share/native/sun/font/layout/IndicRearrangementProcessor2.cpp
@@ -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);
diff --git a/src/share/native/sun/font/layout/IndicRearrangementProcessor2.h b/src/share/native/sun/font/layout/IndicRearrangementProcessor2.h
index b68abe1..691274c 100644
--- a/src/share/native/sun/font/layout/IndicRearrangementProcessor2.h
+++ b/src/share/native/sun/font/layout/IndicRearrangementProcessor2.h
@@ -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;