diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | ChangeLog.pre-1-10 | 10 | ||||
-rw-r--r-- | ChangeLog.pre-1-2 | 10 | ||||
-rw-r--r-- | ChangeLog.pre-1-4 | 10 | ||||
-rw-r--r-- | ChangeLog.pre-1-6 | 10 | ||||
-rw-r--r-- | ChangeLog.pre-1-8 | 10 | ||||
-rw-r--r-- | pango/opentype/ftxgsub.c | 13 | ||||
-rw-r--r-- | pango/opentype/ftxopen.c | 2 |
8 files changed, 61 insertions, 14 deletions
@@ -1,3 +1,13 @@ +Wed Aug 7 12:32:39 2002 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (TT_Load_GSUB_Table): + Offset to MarkAttachClassDef is offset to table, + not offset to offset to table. + + * pango/opentype/ftxopen.c (Get_Device): Handle + NULL device tables which we represent with + d->DeltaValue == NULL. + Wed Aug 7 11:07:10 2002 Owen Taylor <otaylor@redhat.com> * modules/hangul/hangul-xft.c (hangul_engine_shape): Get diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index a120753a..feedc0a8 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,13 @@ +Wed Aug 7 12:32:39 2002 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (TT_Load_GSUB_Table): + Offset to MarkAttachClassDef is offset to table, + not offset to offset to table. + + * pango/opentype/ftxopen.c (Get_Device): Handle + NULL device tables which we represent with + d->DeltaValue == NULL. + Wed Aug 7 11:07:10 2002 Owen Taylor <otaylor@redhat.com> * modules/hangul/hangul-xft.c (hangul_engine_shape): Get diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index a120753a..feedc0a8 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,13 @@ +Wed Aug 7 12:32:39 2002 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (TT_Load_GSUB_Table): + Offset to MarkAttachClassDef is offset to table, + not offset to offset to table. + + * pango/opentype/ftxopen.c (Get_Device): Handle + NULL device tables which we represent with + d->DeltaValue == NULL. + Wed Aug 7 11:07:10 2002 Owen Taylor <otaylor@redhat.com> * modules/hangul/hangul-xft.c (hangul_engine_shape): Get diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index a120753a..feedc0a8 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,13 @@ +Wed Aug 7 12:32:39 2002 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (TT_Load_GSUB_Table): + Offset to MarkAttachClassDef is offset to table, + not offset to offset to table. + + * pango/opentype/ftxopen.c (Get_Device): Handle + NULL device tables which we represent with + d->DeltaValue == NULL. + Wed Aug 7 11:07:10 2002 Owen Taylor <otaylor@redhat.com> * modules/hangul/hangul-xft.c (hangul_engine_shape): Get diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index a120753a..feedc0a8 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,13 @@ +Wed Aug 7 12:32:39 2002 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (TT_Load_GSUB_Table): + Offset to MarkAttachClassDef is offset to table, + not offset to offset to table. + + * pango/opentype/ftxopen.c (Get_Device): Handle + NULL device tables which we represent with + d->DeltaValue == NULL. + Wed Aug 7 11:07:10 2002 Owen Taylor <otaylor@redhat.com> * modules/hangul/hangul-xft.c (hangul_engine_shape): Get diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index a120753a..feedc0a8 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,13 @@ +Wed Aug 7 12:32:39 2002 Owen Taylor <otaylor@redhat.com> + + * pango/opentype/ftxgsub.c (TT_Load_GSUB_Table): + Offset to MarkAttachClassDef is offset to table, + not offset to offset to table. + + * pango/opentype/ftxopen.c (Get_Device): Handle + NULL device tables which we represent with + d->DeltaValue == NULL. + Wed Aug 7 11:07:10 2002 Owen Taylor <otaylor@redhat.com> * modules/hangul/hangul-xft.c (hangul_engine_shape): Get diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c index 6cdf3bd6..6b9d4faf 100644 --- a/pango/opentype/ftxgsub.c +++ b/pango/opentype/ftxgsub.c @@ -352,19 +352,6 @@ if ( lo[i].LookupFlag & IGNORE_SPECIAL_MARKS ) { if ( FILE_Seek( gdef->MarkAttachClassDef_offset ) || - ACCESS_Frame( 2L ) ) - goto Fail1; - - new_offset = GET_UShort(); - - FORGET_Frame(); - - if ( !new_offset ) - return TTO_Err_Invalid_GDEF_SubTable; - - new_offset += base_offset; - - if ( FILE_Seek( new_offset ) || ( error = Load_ClassDefinition( &gdef->MarkAttachClassDef, 256, stream ) ) != TT_Err_Ok ) goto Fail1; diff --git a/pango/opentype/ftxopen.c b/pango/opentype/ftxopen.c index c721eec3..3101d6fd 100644 --- a/pango/opentype/ftxopen.c +++ b/pango/opentype/ftxopen.c @@ -1459,7 +1459,7 @@ f = d->DeltaFormat; - if ( size >= d->StartSize && size <= d->EndSize ) + if ( d->DeltaValue && size >= d->StartSize && size <= d->EndSize ) { s = size - d->StartSize; byte = d->DeltaValue[s >> ( 4 - f )]; |