ICU-57132.0.1.tar.gz

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

diff --git a/icuSources/layout/SingleTableProcessor.cpp b/icuSources/layout/SingleTableProcessor.cpp
index 94a4edd75710aaa1e2c787beff620b813d5838cc..32661dbce47ff69e047c6845fc339536b1414b2d 100644 (file)
--- a/icuSources/layout/SingleTableProcessor.cpp
+++ b/icuSources/layout/SingleTableProcessor.cpp
@@ -1,6 +1,6 @@
 /*
  *
 /*
  *

- * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998-2015 - All Rights Reserved

  *
  */
 
  *
  */
 


@@ -21,26 +21,27 @@ SingleTableProcessor::SingleTableProcessor()
 {
 }
 
 {
 }
 

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

 {
 {

-    const NonContextualGlyphSubstitutionHeader *header = (const NonContextualGlyphSubstitutionHeader *) moprhSubtableHeader;
-
-    singleTableLookupTable = (const SingleTableLookupTable *) &header->table;
+  LEReferenceTo<NonContextualGlyphSubstitutionHeader> header(morphSubtableHeader, success);
+  singleTableLookupTable = LEReferenceTo<SingleTableLookupTable>(morphSubtableHeader, success, (const SingleTableLookupTable*)&header->table);

 }
 
 SingleTableProcessor::~SingleTableProcessor()
 {
 }
 
 }
 
 SingleTableProcessor::~SingleTableProcessor()
 {
 }
 

-void SingleTableProcessor::process(LEGlyphStorage &glyphStorage)
+void SingleTableProcessor::process(LEGlyphStorage &glyphStorage, LEErrorCode &success)

 {
     const LookupSingle *entries = singleTableLookupTable->entries;
     le_int32 glyph;
     le_int32 glyphCount = glyphStorage.getGlyphCount();
 
 {
     const LookupSingle *entries = singleTableLookupTable->entries;
     le_int32 glyph;
     le_int32 glyphCount = glyphStorage.getGlyphCount();
 

+    if (LE_FAILURE(success)) return;
+

     for (glyph = 0; glyph < glyphCount; glyph += 1) {
     for (glyph = 0; glyph < glyphCount; glyph += 1) {

-        const LookupSingle *lookupSingle = singleTableLookupTable->lookupSingle(entries, glyphStorage[glyph]);
+      const LookupSingle *lookupSingle = singleTableLookupTable->lookupSingle(singleTableLookupTable, entries, glyphStorage[glyph], success);

 
         if (lookupSingle != NULL) {
             glyphStorage[glyph] = SWAPW(lookupSingle->value);
 
         if (lookupSingle != NULL) {
             glyphStorage[glyph] = SWAPW(lookupSingle->value);