changeset 11335:017db73c712c

Merge
author asaha
date Mon, 02 Nov 2015 10:44:45 -0800
parents dde6e2f32ad2 f556d4c82ef1
children f13953c1ae68
files
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 22:41:34 2015 +0300
+++ b/src/share/native/sun/font/layout/IndicRearrangementProcessor.cpp	Mon Nov 02 10:44:45 2015 -0800
@@ -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 22:41:34 2015 +0300
+++ b/src/share/native/sun/font/layout/IndicRearrangementProcessor.h	Mon Nov 02 10:44:45 2015 -0800
@@ -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 22:41:34 2015 +0300
+++ b/src/share/native/sun/font/layout/IndicRearrangementProcessor2.cpp	Mon Nov 02 10:44:45 2015 -0800
@@ -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 22:41:34 2015 +0300
+++ b/src/share/native/sun/font/layout/IndicRearrangementProcessor2.h	Mon Nov 02 10:44:45 2015 -0800
@@ -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;