ICU-57132.0.1.tar.gz

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

diff --git a/icuSources/layout/SimpleArrayProcessor.cpp b/icuSources/layout/SimpleArrayProcessor.cpp
index 3220ab82ba626ac0b2e244a80ca1198551b27fc3..be74aeadeea6aaf99a9325caacd3589e525884ab 100644 (file)
--- a/icuSources/layout/SimpleArrayProcessor.cpp
+++ b/icuSources/layout/SimpleArrayProcessor.cpp
@@ -1,7 +1,6 @@
 /*
 /*

- * @(#)SimpleArrayProcessor.cpp        1.6 00/03/15

  *
  *

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

  *
  */
 
  *
  */
 


@@ -11,37 +10,40 @@
 #include "NonContextualGlyphSubst.h"
 #include "NonContextualGlyphSubstProc.h"
 #include "SimpleArrayProcessor.h"
 #include "NonContextualGlyphSubst.h"
 #include "NonContextualGlyphSubstProc.h"
 #include "SimpleArrayProcessor.h"

+#include "LEGlyphStorage.h"

 #include "LESwaps.h"
 
 U_NAMESPACE_BEGIN
 
 #include "LESwaps.h"
 
 U_NAMESPACE_BEGIN
 

-const char SimpleArrayProcessor::fgClassID=0;
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(SimpleArrayProcessor)

 
 SimpleArrayProcessor::SimpleArrayProcessor()
 {
 }
 
 
 SimpleArrayProcessor::SimpleArrayProcessor()
 {
 }
 

-SimpleArrayProcessor::SimpleArrayProcessor(const MorphSubtableHeader *morphSubtableHeader)
-  : NonContextualGlyphSubstitutionProcessor(morphSubtableHeader)
+SimpleArrayProcessor::SimpleArrayProcessor(const LEReferenceTo<MorphSubtableHeader> &morphSubtableHeader, LEErrorCode &success)
+  : NonContextualGlyphSubstitutionProcessor(morphSubtableHeader, success)

 {
 {

-    const NonContextualGlyphSubstitutionHeader *header = (const NonContextualGlyphSubstitutionHeader *) morphSubtableHeader;
-
-    simpleArrayLookupTable = (const SimpleArrayLookupTable *) &header->table;
+  LEReferenceTo<NonContextualGlyphSubstitutionHeader> header(morphSubtableHeader, success);
+  simpleArrayLookupTable = LEReferenceTo<SimpleArrayLookupTable>(morphSubtableHeader, success, (const SimpleArrayLookupTable*)&header->table);

 }
 
 SimpleArrayProcessor::~SimpleArrayProcessor()
 {
 }
 
 }
 
 SimpleArrayProcessor::~SimpleArrayProcessor()
 {
 }
 

-void SimpleArrayProcessor::process(LEGlyphID *glyphs, le_int32 * /*charIndices*/, le_int32 glyphCount)
+void SimpleArrayProcessor::process(LEGlyphStorage &glyphStorage, LEErrorCode &success)

 {
 {

+    le_int32 glyphCount = glyphStorage.getGlyphCount();

     le_int32 glyph;
     le_int32 glyph;

-
-    for (glyph = 0; glyph < glyphCount; glyph += 1) {
-        if (glyphs[glyph] < 0xFFFF) {
-            le_int16 newGlyph = SWAPW(simpleArrayLookupTable->valueArray[glyphs[glyph]]);
-
-            glyphs[glyph] = LE_SET_GLYPH(glyphs[glyph], newGlyph);
+    
+    LEReferenceToArrayOf<LookupValue> valueArray(simpleArrayLookupTable, success, (const LookupValue*)&simpleArrayLookupTable->valueArray, LE_UNBOUNDED_ARRAY);
+
+    for (glyph = 0; LE_SUCCESS(success) && (glyph < glyphCount); glyph += 1) {
+        LEGlyphID thisGlyph = glyphStorage[glyph];
+        if (LE_GET_GLYPH(thisGlyph) < 0xFFFF) {
+          TTGlyphID newGlyph = SWAPW(valueArray.getObject(LE_GET_GLYPH(thisGlyph),success));
+          glyphStorage[glyph] = LE_SET_GLYPH(thisGlyph, newGlyph);

         }
     }
 }
         }
     }
 }