diff options
| author | Werner Lemberg <wl@gnu.org> | 2001-08-13 11:44:29 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2001-08-13 11:44:29 +0000 |
| commit | 5dea44438f74324403cb2974a5701cac7ceab32a (patch) | |
| tree | 711d11870124ddff01d8251ad17e5c2f9a541e83 /src/type1/t1driver.c | |
| parent | 32949c1b9797f6a2618001e04b270a8a17081144 (diff) | |
| download | freetype2-5dea44438f74324403cb2974a5701cac7ceab32a.tar.gz | |
Updating to OpenType 1.3.
* include/freetype/internal/tttypes.h (TT_CMap0, TT_CMap2, TT_CMap4,
TT_CMap6): Adding field `language'.
(TT_CMapTable): Removing field `language'.
Type of `length' field changed to FT_ULong.
Adding fields for cmaps format 8, 10, and 12.
(TT_CMapGroup): New auxiliary structure.
(TT_CMap8_12, TT_CMap10): New structures.
* include/freetype/tttables.h (TT_HoriHeader, TT_VertHeader):
Removed last element of `Reserved' array.
* include/freetype/ttnameid.h (TT_PLATFORM_CUSTOM, TT_MS_ID_UCS_4,
TT_NAME_ID_CID_FINDFONT_NAME): New macros.
* src/sfnt/ttcmap.c (TT_CharMap_Load): Updated loading of `language'
field to the new structures.
Fixed freeing of arrays in case of unsuccessful loads.
Added support for loading format 8, 10, and 12 cmaps.
(TT_CharMap_Free): Added support for freeing format 8, 10, and 12
cmaps.
(code_to_index4): Small improvement.
(code_to_index6): Ditto.
(code_to_index8_12, code_to_index10): New functions.
* src/sfnt/ttload.c (TT_Load_Metrics_Header): Updated to new
structure.
(TT_Load_CMap): Ditto.
* src/sfnt/sfobjs.c (tt_encodings): Add MS UCS4 table (before MS
Unicode).
* src/type1/t1driver.c (t1_get_name_index): Fix compiler warning.
Diffstat (limited to 'src/type1/t1driver.c')
| -rw-r--r-- | src/type1/t1driver.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c index fbde5eccf..40a1d38d3 100644 --- a/src/type1/t1driver.c +++ b/src/type1/t1driver.c @@ -70,6 +70,7 @@ return T1_Err_Ok; } + /*************************************************************************/ /* */ /* <Function> */ @@ -81,6 +82,7 @@ /* */ /* <Input> */ /* face :: A handle to the source face object. */ + /* */ /* glyph_name :: The glyph name. */ /* */ /* <Return> */ @@ -90,15 +92,16 @@ t1_get_name_index( T1_Face face, FT_String* glyph_name ) { - FT_UInt i; + FT_Int i; FT_String* gname; + for ( i = 0; i < face->type1.num_glyphs; i++ ) { gname = face->type1.glyph_names[i]; if ( !strcmp( glyph_name, gname ) ) - return i; + return (FT_UInt)i; } return 0; |