ICU-511.32.tar.gz

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

diff --git a/icuSources/layout/LigatureSubstSubtables.cpp b/icuSources/layout/LigatureSubstSubtables.cpp
index aea4dd98dd96123c94f55d8073a7ddc97418ce96..391ffe649ee1d0cf8202c123e582769facf3c6af 100644 (file)
--- a/icuSources/layout/LigatureSubstSubtables.cpp
+++ b/icuSources/layout/LigatureSubstSubtables.cpp
@@ -1,7 +1,5 @@
 /*
- * %W% %E%
- *
- * (C) Copyright IBM Corp. 1998-2003 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998-2006 - All Rights Reserved
  *
  */
 
@@ -33,10 +31,6 @@ le_uint32 LigatureSubstitutionSubtable::process(GlyphIterator *glyphIterator, co
             TTGlyphID ligGlyph = SWAPW(ligTable->ligGlyph);
             le_uint16 comp;
 
-            if (filter != NULL && ! filter->accept(LE_SET_GLYPH(glyph, ligGlyph))) {
-                continue;
-            }
-
             for (comp = 0; comp < compCount; comp += 1) {
                 if (! glyphIterator->next()) {
                     break;
@@ -47,7 +41,7 @@ le_uint32 LigatureSubstitutionSubtable::process(GlyphIterator *glyphIterator, co
                 }
             }
 
-            if (comp == compCount) {
+            if (comp == compCount && (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, ligGlyph)))) {
                 GlyphIterator tempIterator(*glyphIterator);
                 TTGlyphID deletedGlyph = tempIterator.ignoresMarks()? 0xFFFE : 0xFFFF;