ICU-551.30.tar.gz

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

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

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

  *
  */
 
  *
  */
 


@@ -26,7 +26,7 @@
 U_NAMESPACE_BEGIN
 
 GlyphSubstitutionLookupProcessor::GlyphSubstitutionLookupProcessor(
 U_NAMESPACE_BEGIN
 
 GlyphSubstitutionLookupProcessor::GlyphSubstitutionLookupProcessor(

-        const GlyphSubstitutionTableHeader *glyphSubstitutionTableHeader,
+        const LEReferenceTo<GlyphSubstitutionTableHeader> &glyphSubstitutionTableHeader,

         LETag scriptTag, 
         LETag languageTag, 
         const LEGlyphFilter *filter, 
         LETag scriptTag, 
         LETag languageTag, 
         const LEGlyphFilter *filter, 


@@ -35,7 +35,7 @@ GlyphSubstitutionLookupProcessor::GlyphSubstitutionLookupProcessor(
         le_bool featureOrder,
         LEErrorCode& success)
     : LookupProcessor(
         le_bool featureOrder,
         LEErrorCode& success)
     : LookupProcessor(

-                      (char *) glyphSubstitutionTableHeader,
+                      glyphSubstitutionTableHeader,

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


@@ -48,7 +48,7 @@ GlyphSubstitutionLookupProcessor::GlyphSubstitutionLookupProcessor()
 {
 }
 
 {
 }
 

-le_uint32 GlyphSubstitutionLookupProcessor::applySubtable(const LookupSubtable *lookupSubtable, le_uint16 lookupType,
+le_uint32 GlyphSubstitutionLookupProcessor::applySubtable(const LEReferenceTo<LookupSubtable> &lookupSubtable, le_uint16 lookupType,

                                                        GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const
 {
     if (LE_FAILURE(success)) {
                                                        GlyphIterator *glyphIterator, const LEFontInstance *fontInstance, LEErrorCode& success) const
 {
     if (LE_FAILURE(success)) {


@@ -64,39 +64,39 @@ 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, success, 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, success);
         break;
 
         delta = subtable->process(this, glyphIterator, fontInstance, success);
         break;


@@ -104,7 +104,7 @@ le_uint32 GlyphSubstitutionLookupProcessor::applySubtable(const LookupSubtable *
 
     case gsstChainingContext:
     {
 
     case gsstChainingContext:
     {

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

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


@@ -112,7 +112,7 @@ le_uint32 GlyphSubstitutionLookupProcessor::applySubtable(const LookupSubtable *
 
     case gsstExtension:
     {
 
     case gsstExtension:
     {

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

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