From fb4bfddb1adce2a2170bd5bd46d1b635b821930b Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 13 Dec 2003 18:42:31 +0000 Subject: [PATCH] * 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. --- ChangeLog | 7 +++++++ include/freetype/freetype.h | 6 ++++-- src/cff/cffdrivr.c | 2 +- src/type1/t1gload.c | 7 +++++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7757f7a7b..1881f402f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-12-12 Wolfgang Domröse + + * 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 * src/cff/cffdrivr.c (cff_get_glyph_name): Improve error message. diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index 0c6e67edf..de5bf3a43 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -941,7 +941,7 @@ FT_BEGIN_HEADER /* FT_FACE_FLAG_XXX */ /* */ /* */ - /* 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. */ /* */ /* */ - /* 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 */ diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index d44f1a5ed..9ddb379df 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -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; } diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c index b4573d60f..2d8644fe8 100644 --- a/src/type1/t1gload.c +++ b/src/type1/t1gload.c @@ -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;