ICU-57132.0.1.tar.gz

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

diff --git a/icuSources/layout/NonContextualGlyphSubstProc.cpp b/icuSources/layout/NonContextualGlyphSubstProc.cpp
index 69c065b48487b8acb09840d364ed38fea92475f7..93ea391f5df23ee8220aa993b5527eef3b8cb691 100644 (file)
--- a/icuSources/layout/NonContextualGlyphSubstProc.cpp
+++ b/icuSources/layout/NonContextualGlyphSubstProc.cpp
@@ -1,6 +1,6 @@
 /*
  *
 /*
  *

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

  *
  */
 
  *
  */
 


@@ -22,8 +22,8 @@ NonContextualGlyphSubstitutionProcessor::NonContextualGlyphSubstitutionProcessor
 {
 }
 
 {
 }
 

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

 {
 }
 
 {
 }
 


@@ -31,26 +31,27 @@ NonContextualGlyphSubstitutionProcessor::~NonContextualGlyphSubstitutionProcesso
 {
 }
 
 {
 }
 

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

 {
 {

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

 
 

-    switch (SWAPW(header->table.format))
-    {
+  if(LE_FAILURE(success)) return NULL;
+
+  switch (SWAPW(header->table.format)) {

     case ltfSimpleArray:
     case ltfSimpleArray:

-        return new SimpleArrayProcessor(morphSubtableHeader);
+      return new SimpleArrayProcessor(morphSubtableHeader, success);

 
     case ltfSegmentSingle:
 
     case ltfSegmentSingle:

-        return new SegmentSingleProcessor(morphSubtableHeader);
+      return new SegmentSingleProcessor(morphSubtableHeader, success);

 
     case ltfSegmentArray:
 
     case ltfSegmentArray:

-        return new SegmentArrayProcessor(morphSubtableHeader);
+      return new SegmentArrayProcessor(morphSubtableHeader, success);

 
     case ltfSingleTable:
 
     case ltfSingleTable:

-        return new SingleTableProcessor(morphSubtableHeader);
+      return new SingleTableProcessor(morphSubtableHeader, success);

 
     case ltfTrimmedArray:
 
     case ltfTrimmedArray:

-        return new TrimmedArrayProcessor(morphSubtableHeader);
+      return new TrimmedArrayProcessor(morphSubtableHeader, success);

 
     default:
         return NULL;
 
     default:
         return NULL;