From 49bd4f054ae66bf02af6d1be94dffdd0269846fe Mon Sep 17 00:00:00 2001 From: David Turner Date: Wed, 12 Jul 2000 16:57:37 +0000 Subject: [PATCH] removed some warnings with Visual C++ that prevented compilation --- CHANGES | 5 ++++- src/cff/t2objs.c | 8 ++++---- src/sfnt/ttload.c | 3 +++ 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 17f9b03d7..70031619c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,9 @@ LATEST CHANGES - - renamed the directory "freetype2/config" to "freetype2/build" and + - found some bugs in the composite loader (seac) of the Type1-based + font drivers.. + + - renamed the directory "freetype2/config" to "freetype2/builds" and updated all relevant files.. - found a memory leak in the "type1" driver diff --git a/src/cff/t2objs.c b/src/cff/t2objs.c index 1edb4ab84..1d59a585f 100644 --- a/src/cff/t2objs.c +++ b/src/cff/t2objs.c @@ -392,11 +392,11 @@ root->num_glyphs = cff->charstrings_index.count; /* set global bbox, as well as EM size */ - root->units_per_EM = FT_DivFix( 1000L << 16, - dict->font_matrix.yy ) >> 16; + root->units_per_EM = (FT_UInt)FT_DivFix( 1000L << 16, + dict->font_matrix.yy ) >> 16; root->bbox = dict->font_bbox; - root->ascender = root->bbox.yMax; - root->descender = root->bbox.yMin; + root->ascender = (FT_Short)root->bbox.yMax; + root->descender = (FT_Short)root->bbox.yMin; /* retrieve font family & style name */ root->family_name = T2_Get_Name( &cff->name_index, face_index ); diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c index bfd3abf25..b582ed83f 100644 --- a/src/sfnt/ttload.c +++ b/src/sfnt/ttload.c @@ -985,6 +985,9 @@ } FT_TRACE2(( "loaded\n" )); + /* everything went well, update face->num_names */ + face->num_names = names->numNameRecords; + Exit: return error; }