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

* src/type1/t1gload.c (T1_Parse_Glyph_And_Get_Char_String): Add 

cast.
* src/cff/cffdrivr.c (cff_ps_has_glyph_names): Assure that return
value is either 0 or 1.
This commit is contained in:
Werner Lemberg 2003-12-13 18:42:31 +00:00
parent b36d4a53e9
commit fb4bfddb1a
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2003-12-12 Wolfgang Domröse <porthos.domroese@harz.de>
* src/type1/t1gload.c (T1_Parse_Glyph_And_Get_Char_String): Add
cast.
* src/cff/cffdrivr.c (cff_ps_has_glyph_names): Assure that return
value is either 0 or 1.
2003-12-12 Werner Lemberg <wl@gnu.org>
* src/cff/cffdrivr.c (cff_get_glyph_name): Improve error message.

6
include/freetype/freetype.h
View File

@ -941,7 +941,7 @@ FT_BEGIN_HEADER
/* FT_FACE_FLAG_XXX */
/* */
/* <Description> */
/* A list of bit flags used in the 'face_flags' field of the */
/* A list of bit flags used in the `face_flags' field of the */
/* @FT_FaceRec structure. They inform client applications of */
/* properties of the corresponding face. */
/* */
@ -2030,7 +2030,9 @@ FT_BEGIN_HEADER
/* will be loaded. */
/* */
/* <Input> */
/* glyph_index :: The index of the glyph in the font file. */
/* glyph_index :: The index of the glyph in the font file. For */
/* CID-keyed fonts (either in PS or in CFF format) */
/* this argument specifies the CID value. */
/* */
/* load_flags :: A flag indicating what to load for this glyph. The */
/* @FT_LOAD_XXX constants can be used to control the */

2
src/cff/cffdrivr.c
View File

@ -327,7 +327,7 @@
static FT_Int
cff_ps_has_glyph_names( FT_Face face )
{
return face->face_flags & FT_FACE_FLAG_GLYPH_NAMES;
return ( face->face_flags & FT_FACE_FLAG_GLYPH_NAMES ) > 0;
}

7
src/type1/t1gload.c
View File

@ -81,7 +81,7 @@
/* For ordinary fonts get the character data stored in the face record. */
{
char_string->pointer = type1->charstrings[glyph_index];
char_string->length = type1->charstrings_len[glyph_index];
char_string->length = (FT_Int)type1->charstrings_len[glyph_index];
}
if ( !error )
@ -97,6 +97,7 @@
{
FT_Incremental_MetricsRec metrics;
metrics.bearing_x = decoder->builder.left_bearing.x;
metrics.bearing_y = decoder->builder.left_bearing.y;
metrics.advance = decoder->builder.advance.x;
@ -111,7 +112,7 @@
#endif /* FT_CONFIG_OPTION_INCREMENTAL */
return error;
return error;
}
@ -125,6 +126,7 @@
#ifdef FT_CONFIG_OPTION_INCREMENTAL
if ( !error )
{
T1_Face face = (T1_Face)decoder->builder.face;
@ -135,6 +137,7 @@
face->root.internal->incremental_interface->object,
&glyph_data );
}
#endif /* FT_CONFIG_OPTION_INCREMENTAL */
return error;