cff: Fix some data types mismatching with their sources.

This commit is contained in:
suzuki toshiya 2009-07-03 18:01:21 +09:00
parent 328a0cc745
commit c1608d1257
3 changed files with 19 additions and 8 deletions

View File

@ -1,3 +1,14 @@
2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
cff: Fix some data types mismatching with their sources.
* src/cff/cffgload.c (cff_slot_load): The types of
`top_upm' and `sub_upm' are matched with
CFF_FontRecDict->units_per_em.
* src/cff/cffobjs.c (cff_size_select): Ditto.
(cff_size_request): Ditto.
2009-07-03 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
bdf: Fix some data types mismatching with their sources.

View File

@ -2580,8 +2580,8 @@
FT_Byte fd_index = cff_fd_select_get( &cff->fd_select,
glyph_index );
FT_Int top_upm = cff->top_font.font_dict.units_per_em;
FT_Int sub_upm = cff->subfonts[fd_index]->font_dict.units_per_em;
FT_ULong top_upm = cff->top_font.font_dict.units_per_em;
FT_ULong sub_upm = cff->subfonts[fd_index]->font_dict.units_per_em;
font_matrix = cff->subfonts[fd_index]->font_dict.font_matrix;

View File

@ -224,8 +224,8 @@
CFF_Font font = (CFF_Font)face->extra.data;
CFF_Internal internal = (CFF_Internal)size->internal;
FT_Int top_upm = font->top_font.font_dict.units_per_em;
FT_UInt i;
FT_ULong top_upm = font->top_font.font_dict.units_per_em;
FT_UInt i;
funcs->set_scale( internal->topfont,
@ -235,7 +235,7 @@
for ( i = font->num_subfonts; i > 0; i-- )
{
CFF_SubFont sub = font->subfonts[i - 1];
FT_Int sub_upm = sub->font_dict.units_per_em;
FT_ULong sub_upm = sub->font_dict.units_per_em;
FT_Pos x_scale, y_scale;
@ -296,8 +296,8 @@
CFF_Font font = (CFF_Font)cffface->extra.data;
CFF_Internal internal = (CFF_Internal)size->internal;
FT_Int top_upm = font->top_font.font_dict.units_per_em;
FT_UInt i;
FT_ULong top_upm = font->top_font.font_dict.units_per_em;
FT_UInt i;
funcs->set_scale( internal->topfont,
@ -307,7 +307,7 @@
for ( i = font->num_subfonts; i > 0; i-- )
{
CFF_SubFont sub = font->subfonts[i - 1];
FT_Int sub_upm = sub->font_dict.units_per_em;
FT_ULong sub_upm = sub->font_dict.units_per_em;
FT_Pos x_scale, y_scale;