Offset to MarkAttachClassDef is offset to table, not offset to offset to
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.
This commit is contained in:
parent
48a16fa809
commit
441e7d0292
|
@ -352,19 +352,6 @@
|
||||||
if ( lo[i].LookupFlag & IGNORE_SPECIAL_MARKS )
|
if ( lo[i].LookupFlag & IGNORE_SPECIAL_MARKS )
|
||||||
{
|
{
|
||||||
if ( FILE_Seek( gdef->MarkAttachClassDef_offset ) ||
|
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,
|
( error = Load_ClassDefinition( &gdef->MarkAttachClassDef,
|
||||||
256, stream ) ) != TT_Err_Ok )
|
256, stream ) ) != TT_Err_Ok )
|
||||||
goto Fail1;
|
goto Fail1;
|
||||||
|
|
|
@ -1459,7 +1459,7 @@
|
||||||
|
|
||||||
f = d->DeltaFormat;
|
f = d->DeltaFormat;
|
||||||
|
|
||||||
if ( size >= d->StartSize && size <= d->EndSize )
|
if ( d->DeltaValue && size >= d->StartSize && size <= d->EndSize )
|
||||||
{
|
{
|
||||||
s = size - d->StartSize;
|
s = size - d->StartSize;
|
||||||
byte = d->DeltaValue[s >> ( 4 - f )];
|
byte = d->DeltaValue[s >> ( 4 - f )];
|
||||||
|
|
Loading…
Reference in New Issue