walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor

This commit is contained in:
Behdad Esfahbod 2007-11-18 22:34:08 +00:00
parent 10d6a25a26
commit 3b047380ae
2 changed files with 52 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/harfbuzz-dump-main.c
View File

@ -200,7 +200,7 @@ main (int argc, char **argv)
croak ("HB_Done_GSUB_Table", error); croak ("HB_Done_GSUB_Table", error);
} }
else if (error != HB_Err_Not_Covered) else if (error != HB_Err_Not_Covered)
fprintf (stderr, "HB_Load_GSUB_Table %x\n", error); fprintf (stderr, "HB_Load_GSUB_Table: error 0x%x\n", error);
if (!(error = HB_Load_GPOS_Table (font, &gpos, NULL))) if (!(error = HB_Load_GPOS_Table (font, &gpos, NULL)))
{ {
@ -210,7 +210,7 @@ main (int argc, char **argv)
croak ("HB_Done_GPOS_Table", error); croak ("HB_Done_GPOS_Table", error);
} }
else if (error != HB_Err_Not_Covered) else if (error != HB_Err_Not_Covered)
fprintf (stderr, "HB_Load_GPOS_Table %x\n", error); fprintf (stderr, "HB_Load_GPOS_Table: error 0x%x\n", error);
printf ("</OpenType>\n"); printf ("</OpenType>\n");

101
src/harfbuzz-stream.c
View File

@ -164,66 +164,65 @@ _hb_font_goto_table( HB_Font font,
{ {
LOG(( "not a SFNT font !!\n" )); LOG(( "not a SFNT font !!\n" ));
error = ERR(HB_Err_Invalid_Argument); error = ERR(HB_Err_Invalid_Argument);
goto Exit;
} }
else
/* parse the directory table directly, without using
* FreeType's built-in data structures
*/
HB_UInt offset = 0;
HB_UInt count, nn;
if ( font->num_faces > 1 )
{ {
/* parse the directory table directly, without using /* deal with TrueType collections */
* FreeType's built-in data structures LOG(( ">> This is a TrueType Collection\n" ));
*/
HB_UInt offset = 0;
HB_UInt count, nn;
if ( font->num_faces > 1 ) if ( FILE_Seek( 12 + font->face_index*4 ) ||
{ ACCESS_Frame( 4 ) )
/* deal with TrueType collections */
LOG(( ">> This is a TrueType Collection\n" ));
if ( FILE_Seek( 12 + font->face_index*4 ) ||
ACCESS_Frame( 4 ) )
goto Exit;
offset = GET_ULong();
FORGET_Frame();
}
LOG(( "TrueType offset = %ld\n", offset ));
if ( FILE_Seek( offset+4 ) ||
ACCESS_Frame( 2 ) )
goto Exit; goto Exit;
count = GET_UShort(); offset = GET_ULong();
FORGET_Frame(); FORGET_Frame();
if ( FILE_Seek( offset+12 ) ||
ACCESS_Frame( count*16 ) )
goto Exit;
for ( nn = 0; nn < count; nn++ )
{
HB_UInt tag = GET_ULong();
HB_UInt checksum = GET_ULong();
HB_UInt start = GET_ULong();
HB_UInt size = GET_ULong();
HB_UNUSED(checksum);
HB_UNUSED(size);
if ( tag == the_tag )
{
LOG(( "TrueType table (start: %ld) (size: %ld)\n", start, size ));
error = _hb_stream_seek( stream, start );
goto FoundIt;
}
}
error = HB_Err_Not_Covered;
FoundIt:
FORGET_Frame();
} }
LOG(( "TrueType offset = %ld\n", offset ));
if ( FILE_Seek( offset+4 ) ||
ACCESS_Frame( 2 ) )
goto Exit;
count = GET_UShort();
FORGET_Frame();
if ( FILE_Seek( offset+12 ) ||
ACCESS_Frame( count*16 ) )
goto Exit;
for ( nn = 0; nn < count; nn++ )
{
HB_UInt tag = GET_ULong();
HB_UInt checksum = GET_ULong();
HB_UInt start = GET_ULong();
HB_UInt size = GET_ULong();
HB_UNUSED(checksum);
HB_UNUSED(size);
if ( tag == the_tag )
{
LOG(( "TrueType table (start: %ld) (size: %ld)\n", start, size ));
error = _hb_stream_seek( stream, start );
goto FoundIt;
}
}
error = HB_Err_Not_Covered;
FoundIt:
FORGET_Frame();
Exit: Exit:
LOG(( "TrueType error=%d\n", error )); LOG(( "TrueType error=%d\n", error ));