ICU-57132.0.1.tar.gz

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

diff --git a/icuSources/layout/GlyphSubstLookupProc.cpp b/icuSources/layout/GlyphSubstLookupProc.cpp
index eb25680cce10c8b4a71864c86e5d9da90c3ba2ef..8698b341441969b57d64ce92e86f72b3c941c732 100644 (file)
--- a/icuSources/layout/GlyphSubstLookupProc.cpp
+++ b/icuSources/layout/GlyphSubstLookupProc.cpp
@@ -1,6 +1,6 @@
 /*
  *
 /*
  *

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

  *
  */
 
  *
  */
 


@@ -8,7 +8,7 @@
 #include "LEGlyphFilter.h"
 #include "LEFontInstance.h"
 #include "OpenTypeTables.h"
 #include "LEGlyphFilter.h"
 #include "LEFontInstance.h"
 #include "OpenTypeTables.h"

-#include "Features.h"
+#include "ICUFeatures.h"

 #include "Lookups.h"
 #include "ScriptAndLanguage.h"
 #include "GlyphDefinitionTables.h"
 #include "Lookups.h"
 #include "ScriptAndLanguage.h"
 #include "GlyphDefinitionTables.h"


@@ -26,14 +26,20 @@
 U_NAMESPACE_BEGIN
 
 GlyphSubstitutionLookupProcessor::GlyphSubstitutionLookupProcessor(
 U_NAMESPACE_BEGIN
 
 GlyphSubstitutionLookupProcessor::GlyphSubstitutionLookupProcessor(

-        const GlyphSubstitutionTableHeader *glyphSubstitutionTableHeader,
-        LETag scriptTag, LETag languageTag, const LEGlyphFilter *filter, const FeatureMap *featureMap, le_int32 featureMapCount, le_bool featureOrder)
+        const LEReferenceTo<GlyphSubstitutionTableHeader> &glyphSubstitutionTableHeader,
+        LETag scriptTag, 
+        LETag languageTag, 
+        const LEGlyphFilter *filter, 
+        const FeatureMap *featureMap, 
+        le_int32 featureMapCount, 
+        le_bool featureOrder,
+        LEErrorCode& success)

     : LookupProcessor(
     : LookupProcessor(

-                      (char *) glyphSubstitutionTableHeader,
+                      glyphSubstitutionTableHeader,

                       SWAPW(glyphSubstitutionTableHeader->scriptListOffset),
                       SWAPW(glyphSubstitutionTableHeader->featureListOffset),
                       SWAPW(glyphSubstitutionTableHeader->lookupListOffset),
                       SWAPW(glyphSubstitutionTableHeader->scriptListOffset),
                       SWAPW(glyphSubstitutionTableHeader->featureListOffset),
                       SWAPW(glyphSubstitutionTableHeader->lookupListOffset),

-                      scriptTag, languageTag, featureMap, featureMapCount, featureOrder), fFilter(filter)
+                      scriptTag, languageTag, featureMap, featureMapCount, featureOrder, success), fFilter(filter)

 {
     // anything?
 }
 {
     // anything?
 }


@@ -42,9 +48,13 @@ GlyphSubstitutionLookupProcessor::GlyphSubstitutionLookupProcessor()
 {
 }
 
 {
 }
 

-le_uint32 GlyphSubstitutionLookupProcessor::applySubtable(const LookupSubtable *lookupSubtable, le_uint16 lookupType,
-                                                       GlyphIterator *glyphIterator, const LEFontInstance *fontInstance) const
+le_uint32 GlyphSubstitutionLookupProcessor::applySubtable(const LEReferenceTo<LookupSubtable> &lookupSubtable, le_uint16 lookupType,
+                                                       GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const

 {
 {

+    if (LE_FAILURE(success)) {
+        return 0;
+    }
+

     le_uint32 delta = 0;
 
     switch(lookupType)
     le_uint32 delta = 0;
 
     switch(lookupType)


@@ -54,57 +64,57 @@ le_uint32 GlyphSubstitutionLookupProcessor::applySubtable(const LookupSubtable *
 
     case gsstSingle:
     {
 
     case gsstSingle:
     {

-        const SingleSubstitutionSubtable *subtable = (const SingleSubstitutionSubtable *) lookupSubtable;
+        const LEReferenceTo<SingleSubstitutionSubtable> subtable(lookupSubtable, success);

 
 

-        delta = subtable->process(glyphIterator, fFilter);
+        delta = subtable->process(subtable, glyphIterator, success, fFilter);

         break;
     }
 
     case gsstMultiple:
     {
         break;
     }
 
     case gsstMultiple:
     {

-        const MultipleSubstitutionSubtable *subtable = (const MultipleSubstitutionSubtable *) lookupSubtable;
+        const LEReferenceTo<MultipleSubstitutionSubtable> subtable(lookupSubtable, success);

 
 

-        delta = subtable->process(glyphIterator, fFilter);
+        delta = subtable->process(subtable, glyphIterator, success, fFilter);

         break;
     }
 
     case gsstAlternate:
     {
         break;
     }
 
     case gsstAlternate:
     {

-        const AlternateSubstitutionSubtable *subtable = (const AlternateSubstitutionSubtable *) lookupSubtable;
+        const LEReferenceTo<AlternateSubstitutionSubtable> subtable(lookupSubtable, success);

 
 

-        delta = subtable->process(glyphIterator, fFilter);
+        delta = subtable->process(subtable, glyphIterator, success, fFilter);

         break;
     }
 
     case gsstLigature:
     {
         break;
     }
 
     case gsstLigature:
     {

-        const LigatureSubstitutionSubtable *subtable = (const LigatureSubstitutionSubtable *) lookupSubtable;
+        const LEReferenceTo<LigatureSubstitutionSubtable> subtable(lookupSubtable, success);

 
 

-        delta = subtable->process(glyphIterator, fFilter);
+        delta = subtable->process(subtable, glyphIterator, success, fFilter);

         break;
     }
 
     case gsstContext:
     {
         break;
     }
 
     case gsstContext:
     {

-        const ContextualSubstitutionSubtable *subtable = (const ContextualSubstitutionSubtable *) lookupSubtable;
+        const LEReferenceTo<ContextualSubstitutionSubtable> subtable(lookupSubtable, success);

 
 

-        delta = subtable->process(this, glyphIterator, fontInstance);
+        delta = subtable->process(this, glyphIterator, fontInstance, success);

         break;
     }
 
     case gsstChainingContext:
     {
         break;
     }
 
     case gsstChainingContext:
     {

-        const ChainingContextualSubstitutionSubtable *subtable = (const ChainingContextualSubstitutionSubtable *) lookupSubtable;
+        const LEReferenceTo<ChainingContextualSubstitutionSubtable> subtable(lookupSubtable, success);

 
 

-        delta = subtable->process(this, glyphIterator, fontInstance);
+        delta = subtable->process(this, glyphIterator, fontInstance, success);

         break;
     }
 
     case gsstExtension:
     {
         break;
     }
 
     case gsstExtension:
     {

-        const ExtensionSubtable *subtable = (const ExtensionSubtable *) lookupSubtable;
+        const LEReferenceTo<ExtensionSubtable> subtable(lookupSubtable, success);

 
 

-        delta = subtable->process(this, lookupType, glyphIterator, fontInstance);
+        delta = subtable->process(this, lookupType, glyphIterator, fontInstance, success);

         break;
     }
 
         break;
     }