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

* src/sfnt/sfobjs.c (sfnt_face_load): fixed silly bug that 

prevented embedded bitmaps from being correctly listed and used

    * src/pfr/pfrsbit.c: fixed handling of character advances
This commit is contained in:
David Turner 2006-02-21 16:50:17 +00:00
parent d41aecdbc0
commit 1ae134a233
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-02-21 David Turner <david@freetype.org>
* src/sfnt/sfobjs.c (sfnt_face_load): fixed silly bug that
prevented embedded bitmaps from being correctly listed and used
* src/pfr/pfrsbit.c: fixed handling of character advances
2006-02-20 David Turner <david@freetype.org>
Support binary compatibility with the X.Org server's Xfont library.

15
src/pfr/pfrsbit.c
View File

@ -605,12 +605,21 @@
FT_Byte* p;
advance = FT_MulDiv( size->root.metrics.x_ppem << 8,
/* compute linear advance */
advance = character->advance;
if ( phys->metrics_resolution != phys->outline_resolution )
advance = FT_MulDiv( advance,
phys->outline_resolution,
phys->metrics_resolution );
glyph->root.linearHoriAdvance = advance;
/* compute default advance, i.e. scaled advance. This can be overriden */
/* in the bitmap header of certain glyphs... */
advance = FT_MulDiv( (FT_Fixed)size->root.metrics.x_ppem << 8,
character->advance,
phys->metrics_resolution );
/* XXX: handle linearHoriAdvance correctly! */
if ( FT_STREAM_SEEK( face->header.gps_section_offset + gps_offset ) ||
FT_FRAME_ENTER( gps_size ) )
goto Exit;

2
src/sfnt/sfobjs.c
View File

@ -915,7 +915,7 @@
FT_UInt i, count;
#ifdef FT_OPTIMIZE_MEMORY
#if defined FT_OPTIMIZE_MEMORY && !defined FT_CONFIG_OPTION_OLD_INTERNALS
count = face->sbit_num_strikes;
#else
count = (FT_UInt)face->num_sbit_strikes;