Commit cb23fe6e authored by Werner Lemberg's avatar Werner Lemberg
Browse files

* src/type1/t1gload.c (T1_Load_Glyph), src/cff/cffgload.c
(cff_slot_load), src/cid/cidgload.c (cid_slot_load_glyph): Fix
previous change.
parent a38af1f5
2003-08-06 Werner Lemberg <wl@gnu.org>
* src/type1/t1gload.c (T1_Load_Glyph), src/cff/cffgload.c
(cff_slot_load), src/cid/cidgload.c (cid_slot_load_glyph): Fix
previous change.
2003-08-05 Werner Lemberg <wl@gnu.org> 2003-08-05 Werner Lemberg <wl@gnu.org>
* src/type1/t1gload.c (T1_Load_Glyph), src/cff/cffgload.c * src/type1/t1gload.c (T1_Load_Glyph), src/cff/cffgload.c
......
...@@ -2442,12 +2442,13 @@ ...@@ -2442,12 +2442,13 @@
font_offset.y ); font_offset.y );
advance.x = metrics->horiAdvance; advance.x = metrics->horiAdvance;
advance.y = 0;
FT_Vector_Transform( &advance, &font_matrix );
metrics->horiAdvance = advance.x + font_offset.x;
advance.x = 0;
advance.y = metrics->vertAdvance; advance.y = metrics->vertAdvance;
FT_Vector_Transform( &advance, &font_matrix ); FT_Vector_Transform( &advance, &font_matrix );
advance.x += font_offset.x; metrics->vertAdvance = advance.y + font_offset.y;
advance.y += font_offset.y;
metrics->horiAdvance = advance.x;
metrics->vertAdvance = advance.y;
if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 ) if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 )
{ {
......
...@@ -375,12 +375,13 @@ ...@@ -375,12 +375,13 @@
font_offset.y ); font_offset.y );
advance.x = metrics->horiAdvance; advance.x = metrics->horiAdvance;
advance.y = 0;
FT_Vector_Transform( &advance, &font_matrix );
metrics->horiAdvance = advance.x + font_offset.x;
advance.x = 0;
advance.y = metrics->vertAdvance; advance.y = metrics->vertAdvance;
FT_Vector_Transform( &advance, &font_matrix ); FT_Vector_Transform( &advance, &font_matrix );
advance.x += font_offset.x; metrics->vertAdvance = advance.y + font_offset.y;
advance.y += font_offset.y;
metrics->horiAdvance = advance.x;
metrics->vertAdvance = advance.y;
if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 ) if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 )
{ {
......
...@@ -333,12 +333,13 @@ ...@@ -333,12 +333,13 @@
font_offset.y ); font_offset.y );
advance.x = metrics->horiAdvance; advance.x = metrics->horiAdvance;
advance.y = 0;
FT_Vector_Transform( &advance, &font_matrix );
metrics->horiAdvance = advance.x + font_offset.x;
advance.x = 0;
advance.y = metrics->vertAdvance; advance.y = metrics->vertAdvance;
FT_Vector_Transform( &advance, &font_matrix ); FT_Vector_Transform( &advance, &font_matrix );
advance.x += font_offset.x; metrics->vertAdvance = advance.y + font_offset.y;
advance.y += font_offset.y;
metrics->horiAdvance = advance.x;
metrics->vertAdvance = advance.y;
#endif #endif
if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 ) if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment