ICU-6.2.4.tar.gz

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

diff --git a/icuSources/layout/GlyphSubstitutionTables.cpp b/icuSources/layout/GlyphSubstitutionTables.cpp
index b5231a7de054e86d6208d091196b14ad132397a5..8ae4fc8f28397d7ffd0e82189b16b216a7d9ba10 100644 (file)
--- a/icuSources/layout/GlyphSubstitutionTables.cpp
+++ b/icuSources/layout/GlyphSubstitutionTables.cpp
@@ -1,7 +1,6 @@
 /*
- * @(#)GlyphSubstitutionTables.cpp     1.9 00/03/15
  *
- * (C) Copyright IBM Corp. 1998-2003 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998-2004 - All Rights Reserved
  *
  */
 
@@ -14,32 +13,18 @@
 #include "GlyphSubstitutionTables.h"
 #include "GlyphSubstLookupProc.h"
 #include "ScriptAndLanguage.h"
+#include "LEGlyphStorage.h"
 #include "LESwaps.h"
 
 U_NAMESPACE_BEGIN
 
-void GlyphSubstitutionTableHeader::process(LEGlyphID *glyphs, const LETag **glyphTags, le_int32 glyphCount,
-                                           le_bool rightToLeft, LETag scriptTag, LETag languageTag,
+le_int32 GlyphSubstitutionTableHeader::process(LEGlyphStorage &glyphStorage, le_bool rightToLeft, LETag scriptTag, LETag languageTag,
                                            const GlyphDefinitionTableHeader *glyphDefinitionTableHeader,
                                            const LEGlyphFilter *filter, const LETag *featureOrder) const
 {
     GlyphSubstitutionLookupProcessor processor(this, scriptTag, languageTag, filter, featureOrder);
 
-    processor.process(glyphs, NULL, glyphTags, glyphCount, rightToLeft, glyphDefinitionTableHeader, NULL);
-}
-
-le_bool GlyphSubstitutionTableHeader::coversScript(LETag scriptTag) const
-{
-    const ScriptListTable *scriptListTable = (const ScriptListTable *) ((char *)this + SWAPW(scriptListOffset));
-
-    return scriptListTable->findScript(scriptTag) != NULL;
-}
-
-le_bool GlyphSubstitutionTableHeader::coversScriptAndLanguage(LETag scriptTag, LETag languageTag) const
-{
-    const ScriptListTable *scriptListTable = (const ScriptListTable *) ((char *)this + SWAPW(scriptListOffset));
-
-    return scriptListTable->findLanguage(scriptTag, languageTag, true) != NULL;
+    return processor.process(glyphStorage, NULL, rightToLeft, glyphDefinitionTableHeader, NULL);
 }
 
 U_NAMESPACE_END