From 778791d3b92569db42d483d18167a4fb8e8f9807 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Mon, 25 Aug 2003 14:30:20 +0000 Subject: pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3) Fix problems where Mon Aug 25 10:17:21 2003 Owen Taylor * 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) --- ChangeLog | 7 +++++++ ChangeLog.pre-1-10 | 7 +++++++ ChangeLog.pre-1-4 | 7 +++++++ ChangeLog.pre-1-6 | 7 +++++++ ChangeLog.pre-1-8 | 7 +++++++ pango/opentype/ftxgpos.c | 7 +++---- pango/opentype/ftxgsub.c | 7 +++---- 7 files changed, 41 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d46611de..e4e9acb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Aug 25 10:17:21 2003 Owen Taylor + + * 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) + Mon Aug 25 10:11:59 2003 Owen Taylor * pango/Makefile.am (EXTRA_DIST): add testfonts.c to diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index d46611de..e4e9acb3 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +Mon Aug 25 10:17:21 2003 Owen Taylor + + * 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) + Mon Aug 25 10:11:59 2003 Owen Taylor * pango/Makefile.am (EXTRA_DIST): add testfonts.c to diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index d46611de..e4e9acb3 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,10 @@ +Mon Aug 25 10:17:21 2003 Owen Taylor + + * 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) + Mon Aug 25 10:11:59 2003 Owen Taylor * pango/Makefile.am (EXTRA_DIST): add testfonts.c to diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index d46611de..e4e9acb3 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,10 @@ +Mon Aug 25 10:17:21 2003 Owen Taylor + + * 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) + Mon Aug 25 10:11:59 2003 Owen Taylor * pango/Makefile.am (EXTRA_DIST): add testfonts.c to diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index d46611de..e4e9acb3 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,10 @@ +Mon Aug 25 10:17:21 2003 Owen Taylor + + * 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) + Mon Aug 25 10:11:59 2003 Owen Taylor * pango/Makefile.am (EXTRA_DIST): add testfonts.c to diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c index f3ce13cd..deebe89e 100644 --- a/pango/opentype/ftxgpos.c +++ b/pango/opentype/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/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c index d5850f31..d9a77d63 100644 --- a/pango/opentype/ftxgsub.c +++ b/pango/opentype/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; -- cgit v1.2.1