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

* src/sfnt/sfmtx.c: disabling memory optimization when 

FT_CONFIG_OPTION_OLD_INTERNALS is used. This is because libXfont
    is directly accessing the HMTX data. Grrrrr....
This commit is contained in:
David Turner 2006-02-21 17:06:35 +00:00
parent 1ae134a233
commit c093db9d06
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -3,6 +3,10 @@
* src/sfnt/sfobjs.c (sfnt_face_load): fixed silly bug that
prevented embedded bitmaps from being correctly listed and used
* src/sfnt/sfmtx.c: disabling memory optimization when
FT_CONFIG_OPTION_OLD_INTERNALS is used. This is because libXfont
is directly accessing the HMTX data. Grrrrr....
* src/pfr/pfrsbit.c: fixed handling of character advances
2006-02-20 David Turner <david@freetype.org>

18
src/sfnt/ttmtx.c
View File

@ -35,6 +35,12 @@
#define FT_COMPONENT trace_ttmtx
/* Unfortunately, we can't enable our memory optimizations when
* FT_CONFIG_OPTION_OLD_INTERNALS is defined. This is because some
* rogue clients (libXfont in the X.Org XServer) is directly accessing
* the metrics
*/
/*************************************************************************/
/* */
/* <Function> */
@ -53,7 +59,7 @@
/* <Return> */
/* FreeType error code. 0 means success. */
/* */
#ifdef FT_OPTIMIZE_MEMORY
#if defined FT_OPTIMIZE_MEMORY && !defined FT_CONFIG_OPTION_OLD_INTERNALS
FT_LOCAL_DEF( FT_Error )
tt_face_load_hmtx( TT_Face face,
@ -94,7 +100,7 @@
return error;
}
#else /* !OPTIMIZE_MEMORY */
#else /* !OPTIMIZE_MEMORY || OLD_INTERNALS */
FT_LOCAL_DEF( FT_Error )
tt_face_load_hmtx( TT_Face face,
@ -215,7 +221,7 @@
return error;
}
#endif /* !FT_OPTIMIZE_METRICS */
#endif /* !OPTIMIZE_MEMORY || OLD_INTERNALS */
/*************************************************************************/
@ -324,7 +330,7 @@
/* */
/* advance :: The advance width resp. advance height. */
/* */
#ifdef FT_OPTIMIZE_MEMORY
#if defined FT_OPTIMIZE_MEMORY && !defined FT_CONFIG_OPTION_OLD_INTERNALS
FT_LOCAL_DEF( FT_Error )
tt_face_get_metrics( TT_Face face,
@ -389,7 +395,7 @@
return SFNT_Err_Ok;
}
#else /* !FT_OPTIMIZE_MEMORY */
#else /* !OPTIMIZE_MEMORY || OLD_INTERNALS */
FT_LOCAL_DEF( FT_Error )
tt_face_get_metrics( TT_Face face,
@ -427,7 +433,7 @@
return SFNT_Err_Ok;
}
#endif /* !FT_OPTIMIZE_MEMORY */
#endif /* !OPTIMIZE_MEMORY || OLD_INTERNALS */
/* END */