minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

* src/cff/cffload.c (cff_font_load): Load charstrings_index earlier. 

Use number of charstrings as argument to CFF_Load_FD_Select (as
documented in the CFF specs).
This commit is contained in:
Werner Lemberg 2004-01-15 16:12:36 +00:00
parent f9831a6675
commit edeed6b391
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-01-14 Werner Lemberg <wl@gnu.org>
* src/cff/cffload.c (cff_font_load): Load charstrings_index earlier.
Use number of charstrings as argument to CFF_Load_FD_Select (as
documented in the CFF specs).
2004-01-13 Graham Asher <graham.asher@btinternet.com>
* src/pshinter/pshalgo.c (psh_glyph_init): Move assignment of

16
src/cff/cffload.c
View File

@ -2160,6 +2160,13 @@
if ( error )
goto Exit;
if ( FT_STREAM_SEEK( base_offset + dict->charstrings_offset ) )
goto Exit;
error = cff_new_index( &font->charstrings_index, stream, 0 );
if ( error )
goto Exit;
/* now, check for a CID font */
if ( dict->cid_registry != 0xFFFFU )
{
@ -2204,7 +2211,7 @@
/* now load the FD Select array */
error = CFF_Load_FD_Select( &font->fd_select,
(FT_UInt)dict->cid_count,
font->charstrings_index.count,
stream,
base_offset + dict->cid_fd_select_offset );
@ -2225,13 +2232,6 @@
goto Exit;
}
if ( FT_STREAM_SEEK( base_offset + dict->charstrings_offset ) )
goto Exit;
error = cff_new_index( &font->charstrings_index, stream, 0 );
if ( error )
goto Exit;
/* explicit the global subrs */
font->num_global_subrs = font->global_subrs_index.count;
font->num_glyphs = font->charstrings_index.count;