* src/type1/t1objs.c (T1_Face_Init): Use `/Weight'. Patch from
Savannah bug #22675.
This commit is contained in:
parent
3863c95146
commit
8575117c50
|
@ -1,3 +1,8 @@
|
||||||
|
2008-03-21 Laurence Darby <ldarby>
|
||||||
|
|
||||||
|
* src/type1/t1objs.c (T1_Face_Init): Use `/Weight'. Patch from
|
||||||
|
Savannah bug #22675.
|
||||||
|
|
||||||
2008-03-13 Derek Clegg <dclegg@apple.com>
|
2008-03-13 Derek Clegg <dclegg@apple.com>
|
||||||
|
|
||||||
* src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix named style loop.
|
* src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix named style loop.
|
||||||
|
|
|
@ -27,7 +27,7 @@ CHANGES BETWEEN 2.3.6 and 2.3.5
|
||||||
has been contributed by George Williams.
|
has been contributed by George Williams.
|
||||||
|
|
||||||
|
|
||||||
III. MISCELANEOUS
|
III. MISCELLANEOUS
|
||||||
|
|
||||||
- Build support for symbian has been contributed.
|
- Build support for symbian has been contributed.
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
/* */
|
/* */
|
||||||
/* Type 1 objects manager (body). */
|
/* Type 1 objects manager (body). */
|
||||||
/* */
|
/* */
|
||||||
/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by */
|
/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 by */
|
||||||
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
|
||||||
/* */
|
/* */
|
||||||
/* This file is part of the FreeType project, and may only be used, */
|
/* This file is part of the FreeType project, and may only be used, */
|
||||||
|
@ -298,7 +298,6 @@
|
||||||
|
|
||||||
FT_UNUSED( num_params );
|
FT_UNUSED( num_params );
|
||||||
FT_UNUSED( params );
|
FT_UNUSED( params );
|
||||||
FT_UNUSED( face_index );
|
|
||||||
FT_UNUSED( stream );
|
FT_UNUSED( stream );
|
||||||
|
|
||||||
|
|
||||||
|
@ -361,7 +360,10 @@
|
||||||
root->family_name = info->family_name;
|
root->family_name = info->family_name;
|
||||||
/* assume "Regular" style if we don't know better */
|
/* assume "Regular" style if we don't know better */
|
||||||
root->style_name = (char *)"Regular";
|
root->style_name = (char *)"Regular";
|
||||||
if ( root->family_name )
|
|
||||||
|
if ( info->weight )
|
||||||
|
root->style_name = info->weight;
|
||||||
|
else if ( root->family_name )
|
||||||
{
|
{
|
||||||
char* full = info->full_name;
|
char* full = info->full_name;
|
||||||
char* family = root->family_name;
|
char* family = root->family_name;
|
||||||
|
|
Loading…
Reference in New Issue