ICU-57132.0.1.tar.gz

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

diff --git a/icuSources/layout/CanonShaping.cpp b/icuSources/layout/CanonShaping.cpp
index ea109a77d98f7e302b5fc2125d8d307a3d5e1297..169654e62e447634a2216094cbef2fb2d52265bd 100644 (file)
--- a/icuSources/layout/CanonShaping.cpp
+++ b/icuSources/layout/CanonShaping.cpp
@@ -1,6 +1,6 @@
 /*
  *
 /*
  *

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

  *
  */
 
  *
  */
 


@@ -34,15 +34,15 @@ void CanonShaping::sortMarks(le_int32 *indices, const le_int32 *combiningClasses
 void CanonShaping::reorderMarks(const LEUnicode *inChars, le_int32 charCount, le_bool rightToLeft,
                                 LEUnicode *outChars, LEGlyphStorage &glyphStorage)
 {
 void CanonShaping::reorderMarks(const LEUnicode *inChars, le_int32 charCount, le_bool rightToLeft,
                                 LEUnicode *outChars, LEGlyphStorage &glyphStorage)
 {

-    const GlyphDefinitionTableHeader *gdefTable = (const GlyphDefinitionTableHeader *) glyphDefinitionTable;
-    const ClassDefinitionTable *classTable = gdefTable->getMarkAttachClassDefinitionTable();
+    LEErrorCode success = LE_NO_ERROR;
+    LEReferenceTo<GlyphDefinitionTableHeader> gdefTable(CanonShaping::glyphDefinitionTable, CanonShaping::glyphDefinitionTableLen);
+    LEReferenceTo<ClassDefinitionTable> classTable = gdefTable->getMarkAttachClassDefinitionTable(gdefTable, success);

     le_int32 *combiningClasses = LE_NEW_ARRAY(le_int32, charCount);
     le_int32 *indices = LE_NEW_ARRAY(le_int32, charCount);
     le_int32 *combiningClasses = LE_NEW_ARRAY(le_int32, charCount);
     le_int32 *indices = LE_NEW_ARRAY(le_int32, charCount);

-    LEErrorCode status = LE_NO_ERROR;

     le_int32 i;
 
     for (i = 0; i < charCount; i += 1) {
     le_int32 i;
 
     for (i = 0; i < charCount; i += 1) {

-        combiningClasses[i] = classTable->getGlyphClass((LEGlyphID) inChars[i]);
+      combiningClasses[i] = classTable->getGlyphClass(classTable, (LEGlyphID) inChars[i], success);

         indices[i] = i;
     }
 
         indices[i] = i;
     }
 


@@ -71,7 +71,7 @@ void CanonShaping::reorderMarks(const LEUnicode *inChars, le_int32 charCount, le
         le_int32 index = indices[i];
 
         outChars[i] = inChars[index];
         le_int32 index = indices[i];
 
         outChars[i] = inChars[index];

-        glyphStorage.setCharIndex(out, index, status);
+        glyphStorage.setCharIndex(out, index, success);

     }
 
     LE_DELETE_ARRAY(indices);
     }
 
     LE_DELETE_ARRAY(indices);