ICU-551.51.tar.gz

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

diff --git a/icuSources/layout/ClassDefinitionTables.h b/icuSources/layout/ClassDefinitionTables.h
index 3dfe86e61a54417ef9748c44b52c5e2c82f39e1f..3f881acdac14d83dc1f399fa9525ceef50b8729a 100644 (file)
--- a/icuSources/layout/ClassDefinitionTables.h
+++ b/icuSources/layout/ClassDefinitionTables.h
@@ -1,6 +1,6 @@
 /*
  *
 /*
  *

- * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved

  *
  */
 
  *
  */
 


@@ -21,8 +21,20 @@ struct ClassDefinitionTable
 {
     le_uint16 classFormat;
 
 {
     le_uint16 classFormat;
 

-    le_int32  getGlyphClass(LEGlyphID glyphID) const;
-    le_bool   hasGlyphClass(le_int32 glyphClass) const;
+    le_int32  getGlyphClass(const LETableReference &base, LEGlyphID glyphID, LEErrorCode &success) const;
+    le_bool   hasGlyphClass(const LETableReference &base, le_int32 glyphClass, LEErrorCode &success) const;
+
+  le_int32 getGlyphClass(LEGlyphID glyphID) const {
+    LETableReference base((const le_uint8*)this);
+    LEErrorCode ignored = LE_NO_ERROR;
+    return getGlyphClass(base,glyphID,ignored);
+  }
+
+  le_bool hasGlyphClass(le_int32 glyphClass) const {
+    LETableReference base((const le_uint8*)this);
+    LEErrorCode ignored = LE_NO_ERROR;
+    return hasGlyphClass(base,glyphClass,ignored);
+  }

 };
 
 struct ClassDefFormat1Table : ClassDefinitionTable
 };
 
 struct ClassDefFormat1Table : ClassDefinitionTable


@@ -31,9 +43,11 @@ struct ClassDefFormat1Table : ClassDefinitionTable
     le_uint16  glyphCount;
     le_uint16  classValueArray[ANY_NUMBER];
 
     le_uint16  glyphCount;
     le_uint16  classValueArray[ANY_NUMBER];
 

-    le_int32 getGlyphClass(LEGlyphID glyphID) const;
-    le_bool  hasGlyphClass(le_int32 glyphClass) const;
+    le_int32 getGlyphClass(const LETableReference &base, LEGlyphID glyphID, LEErrorCode &success) const;
+    le_bool  hasGlyphClass(const LETableReference &base, le_int32 glyphClass, LEErrorCode &success) const;

 };
 };

+LE_VAR_ARRAY(ClassDefFormat1Table, classValueArray)
+

 
 struct ClassRangeRecord
 {
 
 struct ClassRangeRecord
 {


@@ -47,9 +61,10 @@ struct ClassDefFormat2Table : ClassDefinitionTable
     le_uint16        classRangeCount;
     GlyphRangeRecord classRangeRecordArray[ANY_NUMBER];
 
     le_uint16        classRangeCount;
     GlyphRangeRecord classRangeRecordArray[ANY_NUMBER];
 

-    le_int32 getGlyphClass(LEGlyphID glyphID) const;
-    le_bool hasGlyphClass(le_int32 glyphClass) const;
+    le_int32 getGlyphClass(const LETableReference &base, LEGlyphID glyphID, LEErrorCode &success) const;
+    le_bool hasGlyphClass(const LETableReference &base, le_int32 glyphClass, LEErrorCode &success) const;

 };
 };

+LE_VAR_ARRAY(ClassDefFormat2Table, classRangeRecordArray)

 
 U_NAMESPACE_END
 #endif
 
 U_NAMESPACE_END
 #endif