ICU-511.27.tar.gz

[apple/icu.git] / icuSources / layout / ClassDefinitionTables.cpp

diff --git a/icuSources/layout/ClassDefinitionTables.cpp b/icuSources/layout/ClassDefinitionTables.cpp
index 83e4a52a152dd97cadb6d005c307a534c930cfed..471a2b3e1b26ff9cdca3cf78d0dfddba8e2352bc 100644 (file)
--- a/icuSources/layout/ClassDefinitionTables.cpp
+++ b/icuSources/layout/ClassDefinitionTables.cpp
@@ -1,7 +1,6 @@
 /*
 /*

- * @(#)ClassDefinitionTables.cpp       1.5 00/03/15

  *
  *

- * (C) Copyright IBM Corp. 1998-2003 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998-2010 - All Rights Reserved

  *
  */
 
  *
  */
 


@@ -69,7 +68,7 @@ le_int32 ClassDefFormat1Table::getGlyphClass(LEGlyphID glyphID) const
     TTGlyphID firstGlyph = SWAPW(startGlyph);
     TTGlyphID lastGlyph  = firstGlyph + SWAPW(glyphCount);
 
     TTGlyphID firstGlyph = SWAPW(startGlyph);
     TTGlyphID lastGlyph  = firstGlyph + SWAPW(glyphCount);
 

-    if (ttGlyphID > firstGlyph && ttGlyphID < lastGlyph) {
+    if (ttGlyphID >= firstGlyph && ttGlyphID < lastGlyph) {

         return SWAPW(classValueArray[ttGlyphID - firstGlyph]);
     }
 
         return SWAPW(classValueArray[ttGlyphID - firstGlyph]);
     }
 


@@ -83,11 +82,11 @@ le_bool ClassDefFormat1Table::hasGlyphClass(le_int32 glyphClass) const
 
     for (i = 0; i < count; i += 1) {
         if (SWAPW(classValueArray[i]) == glyphClass) {
 
     for (i = 0; i < count; i += 1) {
         if (SWAPW(classValueArray[i]) == glyphClass) {

-            return true;
+            return TRUE;

         }
     }
 
         }
     }
 

-    return false;
+    return FALSE;

 }
 
 le_int32 ClassDefFormat2Table::getGlyphClass(LEGlyphID glyphID) const
 }
 
 le_int32 ClassDefFormat2Table::getGlyphClass(LEGlyphID glyphID) const


@@ -111,11 +110,11 @@ le_bool ClassDefFormat2Table::hasGlyphClass(le_int32 glyphClass) const
 
     for (i = 0; i < rangeCount; i += 1) {
         if (SWAPW(classRangeRecordArray[i].rangeValue) == glyphClass) {
 
     for (i = 0; i < rangeCount; i += 1) {
         if (SWAPW(classRangeRecordArray[i].rangeValue) == glyphClass) {

-            return true;
+            return TRUE;

         }
     }
 
         }
     }
 

-    return false;
+    return FALSE;

 }
 
 U_NAMESPACE_END
 }
 
 U_NAMESPACE_END