ICU-461.12.tar.gz

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

diff --git a/icuSources/layout/GlyphSubstitutionTables.cpp b/icuSources/layout/GlyphSubstitutionTables.cpp
index 8ae4fc8f28397d7ffd0e82189b16b216a7d9ba10..bdd81277124881af215e09284e2a693e0f041b91 100644 (file)
--- a/icuSources/layout/GlyphSubstitutionTables.cpp
+++ b/icuSources/layout/GlyphSubstitutionTables.cpp
@@ -1,6 +1,6 @@
 /*
  *
- * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998-2008 - All Rights Reserved
  *
  */
 
@@ -9,7 +9,6 @@
 #include "OpenTypeTables.h"
 #include "Lookups.h"
 #include "GlyphDefinitionTables.h"
-#include "GlyphPositionAdjustments.h"
 #include "GlyphSubstitutionTables.h"
 #include "GlyphSubstLookupProc.h"
 #include "ScriptAndLanguage.h"
@@ -18,13 +17,23 @@
 
 U_NAMESPACE_BEGIN
 
-le_int32 GlyphSubstitutionTableHeader::process(LEGlyphStorage &glyphStorage, le_bool rightToLeft, LETag scriptTag, LETag languageTag,
-                                           const GlyphDefinitionTableHeader *glyphDefinitionTableHeader,
-                                           const LEGlyphFilter *filter, const LETag *featureOrder) const
+le_int32 GlyphSubstitutionTableHeader::process(LEGlyphStorage &glyphStorage,
+                                               le_bool rightToLeft, 
+                                               LETag scriptTag, 
+                                               LETag languageTag,
+                                               const GlyphDefinitionTableHeader *glyphDefinitionTableHeader, 
+                                               const LEGlyphFilter *filter, 
+                                               const FeatureMap *featureMap, 
+                                               le_int32 featureMapCount, 
+                                               le_bool featureOrder,
+                                               LEErrorCode &success) const
 {
-    GlyphSubstitutionLookupProcessor processor(this, scriptTag, languageTag, filter, featureOrder);
+    if (LE_FAILURE(success)) {
+        return 0;
+    } 
 
-    return processor.process(glyphStorage, NULL, rightToLeft, glyphDefinitionTableHeader, NULL);
+    GlyphSubstitutionLookupProcessor processor(this, scriptTag, languageTag, filter, featureMap, featureMapCount, featureOrder, success);
+    return processor.process(glyphStorage, NULL, rightToLeft, glyphDefinitionTableHeader, NULL, success);
 }
 
 U_NAMESPACE_END