diff options
author | Owen Taylor <otaylor@redhat.com> | 2003-07-27 02:40:31 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2003-07-27 02:40:31 +0000 |
commit | 126367f2a45b36f5d65023bebd8241779e46dced (patch) | |
tree | 6a1c8e157859e814793229c24ae43a832f0c7cc4 | |
parent | 57cc7b1cfa97419de4114bced139b09a7d511096 (diff) | |
download | pango-126367f2a45b36f5d65023bebd8241779e46dced.tar.gz |
Check for lookahead glyphs in the right place. (Patch from #116860)
Sat Jul 26 22:30:59 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgsub.c (Lookup_ChainContextSubst{1,2,3}):
Check for lookahead glyphs in the right place. (Patch
from #116860)
* pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}):
Same fix here.
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 9 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 9 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 9 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 9 | ||||
-rw-r--r-- | pango/opentype/ftxgpos.c | 6 | ||||
-rw-r--r-- | pango/opentype/ftxgsub.c | 6 |
7 files changed, 51 insertions, 6 deletions
@@ -1,3 +1,12 @@ +Sat Jul 26 22:30:59 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst{1,2,3}): + Check for lookahead glyphs in the right place. (Patch + from #116860) + + * pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}): + Same fix here. + Sat Jul 26 22:12:46 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgsub.c (Do_String_Lookup, diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 6fc8753b..3f8adf63 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,12 @@ +Sat Jul 26 22:30:59 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst{1,2,3}): + Check for lookahead glyphs in the right place. (Patch + from #116860) + + * pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}): + Same fix here. + Sat Jul 26 22:12:46 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgsub.c (Do_String_Lookup, diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 6fc8753b..3f8adf63 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,12 @@ +Sat Jul 26 22:30:59 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst{1,2,3}): + Check for lookahead glyphs in the right place. (Patch + from #116860) + + * pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}): + Same fix here. + Sat Jul 26 22:12:46 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgsub.c (Do_String_Lookup, diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 6fc8753b..3f8adf63 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,12 @@ +Sat Jul 26 22:30:59 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst{1,2,3}): + Check for lookahead glyphs in the right place. (Patch + from #116860) + + * pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}): + Same fix here. + Sat Jul 26 22:12:46 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgsub.c (Do_String_Lookup, diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 6fc8753b..3f8adf63 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,12 @@ +Sat Jul 26 22:30:59 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst{1,2,3}): + Check for lookahead glyphs in the right place. (Patch + from #116860) + + * pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}): + Same fix here. + Sat Jul 26 22:12:46 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgsub.c (Do_String_Lookup, diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c index 7a17e1cc..f3ce13cd 100644 --- a/pango/opentype/ftxgpos.c +++ b/pango/opentype/ftxgpos.c @@ -5323,7 +5323,7 @@ /* we are starting to check for lookahead glyphs right after the last context glyph */ - curr_pos = j; + curr_pos += j; s_in = &in->string[curr_pos]; for ( i = 0, j = 0; i < lgc; i++, j++ ) @@ -5521,7 +5521,7 @@ /* we are starting to check for lookahead glyphs right after the last context glyph */ - curr_pos = j; + curr_pos += j; s_in = &in->string[curr_pos]; lc = cpcr.Lookahead; @@ -5669,7 +5669,7 @@ /* we are starting to check for lookahead glyphs right after the last context glyph */ - curr_pos = j; + curr_pos += j; s_in = &in->string[curr_pos]; lc = ccpf3->LookaheadCoverage; diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c index e9b5548a..e473ca95 100644 --- a/pango/opentype/ftxgsub.c +++ b/pango/opentype/ftxgsub.c @@ -3514,7 +3514,7 @@ /* we are starting to check for lookahead glyphs right after the last context glyph */ - curr_pos = j; + curr_pos += j; s_in = &in->string[curr_pos]; for ( i = 0, j = 0; i < lgc; i++, j++ ) @@ -3712,7 +3712,7 @@ /* we are starting to check for lookahead glyphs right after the last context glyph */ - curr_pos = j; + curr_pos += j; s_in = &in->string[curr_pos]; lc = ccsr.Lookahead; @@ -3859,7 +3859,7 @@ /* we are starting for lookahead glyphs right after the last context glyph */ - curr_pos = j; + curr_pos += j; s_in = &in->string[curr_pos]; lc = ccsf3->LookaheadCoverage; |