--- a/jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp Sun Dec 05 15:51:31 2010 +0300
+++ b/jdk/src/share/native/sun/font/layout/LigatureSubstSubtables.cpp Mon Dec 06 16:10:01 2010 -0800
@@ -26,7 +26,7 @@
/*
*
*
- * (C) Copyright IBM Corp. 1998-2003 - All Rights Reserved
+ * (C) Copyright IBM Corp. 1998-2006 - All Rights Reserved
*
*/
@@ -58,10 +58,6 @@
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;
@@ -72,7 +68,7 @@
}
}
- if (comp == compCount) {
+ if (comp == compCount && (filter == NULL || filter->accept(LE_SET_GLYPH(glyph, ligGlyph)))) {
GlyphIterator tempIterator(*glyphIterator);
TTGlyphID deletedGlyph = tempIterator.ignoresMarks()? 0xFFFE : 0xFFFF;