pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3) Fix problems where

Mon Aug 25 10:17:21 2003  Owen Taylor  <otaylor@redhat.com>

        * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3)
        * pango/opentype/ftxgpos.c (Lookup_ChainContextPos3):
        Fix problems where the coverage wasn't being checked
        for the first input glyph. (#118639, Kailash C. Chowksey)

diff --git a/src/ftxgpos.c b/src/ftxgpos.c
index f3ce13c..deebe89 100644 (file)
--- a/src/ftxgpos.c
+++ b/src/ftxgpos.c
@@ -5646,11 +5646,10 @@
     s_in     = &in->string[curr_pos];
     ic       = ccpf3->InputCoverage;
 
-    /* Start at 1 because [0] is implied */
-
-    for ( i = 1, j = 1; i < igc; i++, j++ )
+    for ( i = 0, j = 0; i < igc; i++, j++ )
     {
-      while ( CHECK_Property( gdef, s_in[j], flags, &property ) )
+      /* We already called CHECK_Property for s_in[0] */
+      while ( j > 0 && CHECK_Property( gdef, s_in[j], flags, &property ) )
       {
         if ( error && error != TTO_Err_Not_Covered )
           return error;

diff --git a/src/ftxgsub.c b/src/ftxgsub.c
index d5850f3..d9a77d6 100644 (file)
--- a/src/ftxgsub.c
+++ b/src/ftxgsub.c
@@ -3811,11 +3811,10 @@
     s_in     = &in->string[curr_pos];
     ic       = ccsf3->InputCoverage;
 
-    /* Start at 1 because [0] is implied */
-
-    for ( i = 1, j = 1; i < igc; i++, j++ )
+    for ( i = 0, j = 0; i < igc; i++, j++ )
     {
-      while ( CHECK_Property( gdef, s_in[j], flags, &property ) )
+      /* We already called CHECK_Property for s_in[0] */
+      while ( j > 0 && CHECK_Property( gdef, s_in[j], flags, &property ) )
       {
         if ( error && error != TTO_Err_Not_Covered )
           return error;