diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-07-26 13:21:00 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-07-26 13:21:00 +0000 |
| commit | 2376244be34d16225c1630b6febdb8635c23a604 (patch) | |
| tree | b5c781b90df2c4d4a282748a9c00e0f32db6bdd2 | |
| parent | b352515cf7df1f928de77a34b4323b1f4bed16f1 (diff) | |
| download | pango-2376244be34d16225c1630b6febdb8635c23a604.tar.gz | |
Fix some FreeType1 variable declarations that snuck in from the last
Sat Jul 26 09:16:57 2003 Owen Taylor <otaylor@redhat.com>
* pango/opentype/ftxgpos.c pango/opentype/ftxopen.c:
Fix some FreeType1 variable declarations that snuck
in from the last commits (Christophe Fergeau,
118363)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 7 | ||||
| -rw-r--r-- | pango/opentype/ftxgpos.c | 6 | ||||
| -rw-r--r-- | pango/opentype/ftxopen.c | 2 |
7 files changed, 39 insertions, 4 deletions
@@ -1,3 +1,10 @@ +Sat Jul 26 09:16:57 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgpos.c pango/opentype/ftxopen.c: + Fix some FreeType1 variable declarations that snuck + in from the last commits (Christophe Fergeau, + 118363) + Fri Jul 25 23:38:07 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgpos.c pango/opentype/ftxgsub.c: diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 31ea4891..0fc1bedd 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,10 @@ +Sat Jul 26 09:16:57 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgpos.c pango/opentype/ftxopen.c: + Fix some FreeType1 variable declarations that snuck + in from the last commits (Christophe Fergeau, + 118363) + Fri Jul 25 23:38:07 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgpos.c pango/opentype/ftxgsub.c: diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 31ea4891..0fc1bedd 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,10 @@ +Sat Jul 26 09:16:57 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgpos.c pango/opentype/ftxopen.c: + Fix some FreeType1 variable declarations that snuck + in from the last commits (Christophe Fergeau, + 118363) + Fri Jul 25 23:38:07 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgpos.c pango/opentype/ftxgsub.c: diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 31ea4891..0fc1bedd 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,10 @@ +Sat Jul 26 09:16:57 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgpos.c pango/opentype/ftxopen.c: + Fix some FreeType1 variable declarations that snuck + in from the last commits (Christophe Fergeau, + 118363) + Fri Jul 25 23:38:07 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgpos.c pango/opentype/ftxgsub.c: diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 31ea4891..0fc1bedd 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,10 @@ +Sat Jul 26 09:16:57 2003 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgpos.c pango/opentype/ftxopen.c: + Fix some FreeType1 variable declarations that snuck + in from the last commits (Christophe Fergeau, + 118363) + Fri Jul 25 23:38:07 2003 Owen Taylor <otaylor@redhat.com> * pango/opentype/ftxgpos.c pango/opentype/ftxgsub.c: diff --git a/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c index 5137719d..c34696cb 100644 --- a/pango/opentype/ftxgpos.c +++ b/pango/opentype/ftxgpos.c @@ -6133,9 +6133,9 @@ FT_UShort* properties = gpos->LookupList.Properties; FT_UShort* p_in = in->properties; - int nesting_level = 0; - UShort i; - TT_Pos offset; + int nesting_level = 0; + FT_UShort i; + FT_Pos offset; gpi->first = 0xFFFF; diff --git a/pango/opentype/ftxopen.c b/pango/opentype/ftxopen.c index 5d9cfad3..c9ac6603 100644 --- a/pango/opentype/ftxopen.c +++ b/pango/opentype/ftxopen.c @@ -584,7 +584,7 @@ TTO_SubTable* st; - Bool is_extension = FALSE; + FT_Bool is_extension = FALSE; base_offset = FILE_Pos(); |