* src/pcf/pcfread.c (pcf_interpret_style): Always allocate memory for
face->style_name. * src/pcf/pcfdrivr.c (PCF_Face_Done): Free `style_name'. * include/freetype/config/ftconfig.h (FT_SIZEOF_LONG): Recognize five-byte `long' (which is avoided then).
This commit is contained in:
parent
2541a40d95
commit
004f3da80a
13
ChangeLog
13
ChangeLog
|
@ -1,3 +1,14 @@
|
||||||
|
2004-07-26 Søren Sandmann <sandmann@daimi.au.dk>
|
||||||
|
|
||||||
|
* src/pcf/pcfread.c (pcf_interpret_style): Always allocate memory for
|
||||||
|
face->style_name.
|
||||||
|
* src/pcf/pcfdrivr.c (PCF_Face_Done): Free `style_name'.
|
||||||
|
|
||||||
|
2004-07-26 Darren J Longhorn <darren.longhorn@redcom.co.uk>
|
||||||
|
|
||||||
|
* include/freetype/config/ftconfig.h (FT_SIZEOF_LONG): Recognize
|
||||||
|
five-byte `long' (which is avoided then).
|
||||||
|
|
||||||
2004-07-25 Detlef Würkner <TetiSoft@apg.lahn.de>
|
2004-07-25 Detlef Würkner <TetiSoft@apg.lahn.de>
|
||||||
|
|
||||||
* src/pcf/pcfdrivr.c (PCF_Set_Pixel_Size): Compare heights, not
|
* src/pcf/pcfdrivr.c (PCF_Set_Pixel_Size): Compare heights, not
|
||||||
|
@ -17,7 +28,7 @@
|
||||||
2004-07-24 Derek B. Noonburg <derekn@foolabs.com>
|
2004-07-24 Derek B. Noonburg <derekn@foolabs.com>
|
||||||
|
|
||||||
* src/cff/cffload.c (cff_font_load): Always create inverse mapping.
|
* src/cff/cffload.c (cff_font_load): Always create inverse mapping.
|
||||||
Even if the charstring count id different from the CID count, it is
|
Even if the charstring count is the same as the CID count, it is
|
||||||
still possible that the font uses a different CID -> GID mapping.
|
still possible that the font uses a different CID -> GID mapping.
|
||||||
|
|
||||||
2004-07-23 Werner Lemberg <wl@gnu.org>
|
2004-07-23 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
|
@ -72,20 +72,23 @@ FT_BEGIN_HEADER
|
||||||
|
|
||||||
|
|
||||||
/* The size of an `int' type. */
|
/* The size of an `int' type. */
|
||||||
#if FT_UINT_MAX == 0xFFFFFFFFUL
|
#if FT_UINT_MAX == 0xFFFFUL
|
||||||
#define FT_SIZEOF_INT (32 / FT_CHAR_BIT)
|
|
||||||
#elif FT_UINT_MAX == 0xFFFFU
|
|
||||||
#define FT_SIZEOF_INT (16 / FT_CHAR_BIT)
|
#define FT_SIZEOF_INT (16 / FT_CHAR_BIT)
|
||||||
#elif FT_UINT_MAX > 0xFFFFFFFFU && FT_UINT_MAX == 0xFFFFFFFFFFFFFFFFU
|
#elif FT_UINT_MAX == 0xFFFFFFFFUL
|
||||||
|
#define FT_SIZEOF_INT (32 / FT_CHAR_BIT)
|
||||||
|
#elif FT_UINT_MAX > 0xFFFFFFFFUL && FT_UINT_MAX == 0xFFFFFFFFFFFFFFFFUL
|
||||||
#define FT_SIZEOF_INT (64 / FT_CHAR_BIT)
|
#define FT_SIZEOF_INT (64 / FT_CHAR_BIT)
|
||||||
#else
|
#else
|
||||||
#error "Unsupported size of `int' type!"
|
#error "Unsupported size of `int' type!"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* The size of a `long' type. */
|
/* The size of a `long' type. A five-byte `long' (as used e.g. on the */
|
||||||
#if FT_ULONG_MAX == 0xFFFFFFFFUL
|
/* DM642) is recognized but avoided. */
|
||||||
|
#if FT_ULONG_MAX == 0xFFFFFFFFUL
|
||||||
#define FT_SIZEOF_LONG (32 / FT_CHAR_BIT)
|
#define FT_SIZEOF_LONG (32 / FT_CHAR_BIT)
|
||||||
#elif FT_ULONG_MAX > 0xFFFFFFFFU && FT_ULONG_MAX == 0xFFFFFFFFFFFFFFFFU
|
#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFUL
|
||||||
|
#define FT_SIZEOF_LONG (32 / FT_CHAR_BIT)
|
||||||
|
#elif FT_ULONG_MAX > 0xFFFFFFFFUL && FT_ULONG_MAX == 0xFFFFFFFFFFFFFFFFUL
|
||||||
#define FT_SIZEOF_LONG (64 / FT_CHAR_BIT)
|
#define FT_SIZEOF_LONG (64 / FT_CHAR_BIT)
|
||||||
#else
|
#else
|
||||||
#error "Unsupported size of `long' type!"
|
#error "Unsupported size of `long' type!"
|
||||||
|
|
|
@ -221,6 +221,7 @@ THE SOFTWARE.
|
||||||
|
|
||||||
FT_FREE( face->toc.tables );
|
FT_FREE( face->toc.tables );
|
||||||
FT_FREE( pcfface->family_name );
|
FT_FREE( pcfface->family_name );
|
||||||
|
FT_FREE( pcfface->style_name );
|
||||||
FT_FREE( pcfface->available_sizes );
|
FT_FREE( pcfface->available_sizes );
|
||||||
FT_FREE( face->charset_encoding );
|
FT_FREE( face->charset_encoding );
|
||||||
FT_FREE( face->charset_registry );
|
FT_FREE( face->charset_registry );
|
||||||
|
|
|
@ -945,7 +945,12 @@ THE SOFTWARE.
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !parts || !len )
|
if ( !parts || !len )
|
||||||
face->style_name = (char *)"Regular";
|
{
|
||||||
|
if ( FT_ALLOC( face->style_name, 8 ) )
|
||||||
|
return error;
|
||||||
|
ft_strcpy( face->style_name, "Regular" );
|
||||||
|
face->style_name[7] = '\0';
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
char *style, *s;
|
char *style, *s;
|
||||||
|
|
Loading…
Reference in New Issue