ICU-57132.0.1.tar.gz

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

diff --git a/icuSources/layout/SegmentSingleProcessor.cpp b/icuSources/layout/SegmentSingleProcessor.cpp
index 6c190363dcf82ad05a1ed34e08a1779482ff854c..ec8ca25588aff49e463b10ec8fd86836edd33736 100644 (file)
--- a/icuSources/layout/SegmentSingleProcessor.cpp
+++ b/icuSources/layout/SegmentSingleProcessor.cpp
@@ -1,7 +1,6 @@
 /*
 /*

- * @(#)SegmentSingleProcessor.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,40 +10,42 @@
 #include "NonContextualGlyphSubst.h"
 #include "NonContextualGlyphSubstProc.h"
 #include "SegmentSingleProcessor.h"
 #include "NonContextualGlyphSubst.h"
 #include "NonContextualGlyphSubstProc.h"
 #include "SegmentSingleProcessor.h"

+#include "LEGlyphStorage.h"

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

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

 
 SegmentSingleProcessor::SegmentSingleProcessor()
 {
 }
 
 
 SegmentSingleProcessor::SegmentSingleProcessor()
 {
 }
 

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

 {
 {

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

 }
 
 SegmentSingleProcessor::~SegmentSingleProcessor()
 {
 }
 
 }
 
 SegmentSingleProcessor::~SegmentSingleProcessor()
 {
 }
 

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

 {
     const LookupSegment *segments = segmentSingleLookupTable->segments;
 {
     const LookupSegment *segments = segmentSingleLookupTable->segments;

+    le_int32 glyphCount = glyphStorage.getGlyphCount();

     le_int32 glyph;
 
     le_int32 glyph;
 

-    for (glyph = 0; glyph < glyphCount; glyph += 1) {
-        const LookupSegment *lookupSegment = segmentSingleLookupTable->lookupSegment(segments, glyphs[glyph]);
+    for (glyph = 0; glyph < glyphCount && LE_SUCCESS(success); glyph += 1) {
+        LEGlyphID thisGlyph = glyphStorage[glyph];
+        const LookupSegment *lookupSegment = segmentSingleLookupTable->lookupSegment(segmentSingleLookupTable, segments, thisGlyph, success);

 
 

-        if (lookupSegment != NULL) {
-            TTGlyphID newGlyph = (TTGlyphID) LE_GET_GLYPH(glyphs[glyph]) + SWAPW(lookupSegment->value);
+        if (lookupSegment != NULL && LE_SUCCESS(success)) {
+            TTGlyphID   newGlyph  = (TTGlyphID) LE_GET_GLYPH(thisGlyph) + SWAPW(lookupSegment->value);

 
 

-            glyphs[glyph] = LE_SET_GLYPH(glyphs[glyph], newGlyph);
+            glyphStorage[glyph] = LE_SET_GLYPH(thisGlyph, newGlyph);

         }
     }
 }
         }
     }
 }