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

* include/freetype/config/ftstdlib.h (ft_strstr): New wrapper 

macro for `strstr'.

* src/truetype/ttobjs.c (tt_face_init): Use ft_strstr for scanning
`trick_names', as suggested by Ivan Nincic.
This commit is contained in:
Werner Lemberg 2007-03-06 11:59:24 +00:00
parent dddd068e5d
commit 3d92f08bc5
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-03-05 Werner Lemberg <wl@gnu.org>
* include/freetype/config/ftstdlib.h (ft_strstr): New wrapper
macro for `strstr'.
* src/truetype/ttobjs.c (tt_face_init): Use ft_strstr for scanning
`trick_names', as suggested by Ivan Nincic.
2007-03-05 David Turner <david@freetype.org>
* src/base/ftinit.c (FT_Init_FreeType): fixed a small memory leak

3
include/freetype/config/ftstdlib.h
View File

@ -5,7 +5,7 @@
/* ANSI-specific library and header configuration file (specification */
/* only). */
/* */
/* Copyright 2002, 2003, 2004, 2005, 2006 by */
/* Copyright 2002, 2003, 2004, 2005, 2006, 2007 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -101,6 +101,7 @@
#define ft_strncmp strncmp
#define ft_strncpy strncpy
#define ft_strrchr strrchr
#define ft_strstr strstr
/**********************************************************************/

2
src/autofit/aflatin.c
View File

@ -479,7 +479,7 @@
if ( dim == AF_DIMENSION_HORZ )
{
if ( fitted < scaled )
scale -= scale/50; /* x_scale = x_scale*0.98 */
scale -= scale / 50; /* scale *= 0.98 */
}
else
{

8
src/pshinter/pshalgo.c
View File

@ -2220,11 +2220,11 @@
PSH_Dimension dim_x = &glyph->globals->dimension[0];
PSH_Dimension dim_y = &glyph->globals->dimension[1];
FT_Fixed x_scale = dim_x->scale_mult;
FT_Fixed y_scale = dim_y->scale_mult;
FT_Fixed x_scale = dim_x->scale_mult;
FT_Fixed y_scale = dim_y->scale_mult;
FT_Fixed scaled;
FT_Fixed fitted;
FT_Fixed scaled;
FT_Fixed fitted;
scaled = FT_MulFix( globals->blues.normal_top.zones->org_ref, y_scale );

4
src/truetype/ttobjs.c
View File

@ -283,8 +283,8 @@
/* be worth to do more checks for a few special cases. */
for ( nn = 0; trick_names[nn] != NULL; nn++ )
{
if ( ttface->family_name &&
ft_strcmp( ttface->family_name, trick_names[nn] ) == 0 )
if ( ttface->family_name &&
ft_strstr( ttface->family_name, trick_names[nn] ) )
{
unpatented_hinting = 1;
break;