ICU-511.32.tar.gz

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

diff --git a/icuSources/layout/SegmentArrayProcessor.cpp b/icuSources/layout/SegmentArrayProcessor.cpp
index 67eaf6267ff5c442290b72bd00330fdb54efbf79..b915cb9b92c2a698ad6d4fb6e1b63574106a57cc 100644 (file)
--- 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 "NonContextualGlyphSubst.h"
 #include "NonContextualGlyphSubstProc.h"
 #include "SegmentArrayProcessor.h"

+#include "LEGlyphStorage.h"

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

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

 
 SegmentArrayProcessor::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;
 {
     const LookupSegment *segments = segmentArrayLookupTable->segments;

+    le_int32 glyphCount = glyphStorage.getGlyphCount();

     le_int32 glyph;
 
     for (glyph = 0; glyph < glyphCount; glyph += 1) {
     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) {
 
         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);

             } 
         }
     }
             } 
         }
     }