removed some warnings with Visual C++

that prevented compilation
This commit is contained in:
David Turner 2000-07-12 16:57:37 +00:00
parent 6cca5578b6
commit 49bd4f054a
3 changed files with 11 additions and 5 deletions

View File

@ -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

View File

@ -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 );

View File

@ -985,6 +985,9 @@
}
FT_TRACE2(( "loaded\n" ));
/* everything went well, update face->num_names */
face->num_names = names->numNameRecords;
Exit:
return error;
}