* src/cff/cffgload.c (cff_slot_load): Fix logic of 2007-05-28

change.
This commit is contained in:
Werner Lemberg 2007-06-20 07:07:55 +00:00
parent c67fb6f1a3
commit 5b4d435a96
2 changed files with 11 additions and 6 deletions

View File

@ -1,3 +1,8 @@
2007-06-20 Werner Lemberg <wl@gnu.org>
* src/cff/cffgload.c (cff_slot_load): Fix logic of 2007-05-28
change.
2007-06-19 Werner Lemberg <wl@gnu.org> 2007-06-19 Werner Lemberg <wl@gnu.org>
* src/type1/t1load.c (parse_encoding): Handle one more error. * src/type1/t1load.c (parse_encoding): Handle one more error.

View File

@ -2566,14 +2566,14 @@
glyph->root.outline.flags |= FT_OUTLINE_REVERSE_FILL; glyph->root.outline.flags |= FT_OUTLINE_REVERSE_FILL;
/* apply the font matrix */ /* apply the font matrix */
if ( font_matrix.xx != 0x10000L && if ( !( font_matrix.xx == 0x10000L &&
font_matrix.yy != 0x10000L && font_matrix.yy == 0x10000L &&
font_matrix.xy != 0 && font_matrix.xy == 0 &&
font_matrix.yx != 0 ) font_matrix.yx == 0 ) )
FT_Outline_Transform( &glyph->root.outline, &font_matrix ); FT_Outline_Transform( &glyph->root.outline, &font_matrix );
if ( font_offset.x != 0 || if ( !( font_offset.x == 0 &&
font_offset.y != 0 ) font_offset.y == 0 ) )
FT_Outline_Translate( &glyph->root.outline, FT_Outline_Translate( &glyph->root.outline,
font_offset.x, font_offset.y ); font_offset.x, font_offset.y );