X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/b75a7d8f3b4adbae880cab104ce2c6a50eee4db2..e4f10fab0c078f399c9deef476d9c9b73b47dff8:/icuSources/layout/SegmentArrayProcessor.cpp

diff --git a/icuSources/layout/SegmentArrayProcessor.cpp b/icuSources/layout/SegmentArrayProcessor.cpp
index 67eaf626..b915cb9b 100644
--- a/icuSources/layout/SegmentArrayProcessor.cpp
+++ b/icuSources/layout/SegmentArrayProcessor.cpp
@@ -1,7 +1,6 @@
 /*
- * @(#)SegmentArrayProcessor.cpp	1.6 00/03/15
  *
- * (C) Copyright IBM Corp. 1998-2003 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved
  *
  */
 
@@ -11,11 +10,12 @@
 #include "NonContextualGlyphSubst.h"
 #include "NonContextualGlyphSubstProc.h"
 #include "SegmentArrayProcessor.h"
+#include "LEGlyphStorage.h"
 #include "LESwaps.h"
 
 U_NAMESPACE_BEGIN
 
-const char SegmentArrayProcessor::fgClassID=0;
+UOBJECT_DEFINE_RTTI_IMPLEMENTATION(SegmentArrayProcessor)
 
 SegmentArrayProcessor::SegmentArrayProcessor()
 {
@@ -33,23 +33,25 @@ SegmentArrayProcessor::~SegmentArrayProcessor()
 {
 }
 
-void SegmentArrayProcessor::process(LEGlyphID *glyphs, le_int32 * /*charIndices*/, le_int32 glyphCount)
+void SegmentArrayProcessor::process(LEGlyphStorage &glyphStorage)
 {
     const LookupSegment *segments = segmentArrayLookupTable->segments;
+    le_int32 glyphCount = glyphStorage.getGlyphCount();
     le_int32 glyph;
 
     for (glyph = 0; glyph < glyphCount; glyph += 1) {
-        const LookupSegment *lookupSegment = segmentArrayLookupTable->lookupSegment(segments, glyphs[glyph]);
+        LEGlyphID thisGlyph = glyphStorage[glyph];
+        const LookupSegment *lookupSegment = segmentArrayLookupTable->lookupSegment(segments, thisGlyph);
 
         if (lookupSegment != NULL)  {
             TTGlyphID firstGlyph = SWAPW(lookupSegment->firstGlyph);
             le_int16  offset = SWAPW(lookupSegment->value);
 
             if (offset != 0) {
-                TTGlyphID *glyphArray = (TTGlyphID *) ((char *) subtableHeader + offset);
-                TTGlyphID  newGlyph   = SWAPW(glyphArray[LE_GET_GLYPH(glyphs[glyph]) - firstGlyph]);
+                TTGlyphID  *glyphArray = (TTGlyphID *) ((char *) subtableHeader + offset);
+                TTGlyphID   newGlyph   = SWAPW(glyphArray[LE_GET_GLYPH(thisGlyph) - firstGlyph]);
                 
-                glyphs[glyph] = LE_SET_GLYPH(glyphs[glyph], newGlyph);
+                glyphStorage[glyph] = LE_SET_GLYPH(thisGlyph, newGlyph);
             } 
         }
     }