diff options
| author | Werner Lemberg <wl@gnu.org> | 2003-08-06 17:27:14 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2003-08-06 17:27:14 +0000 |
| commit | cb23fe6eeec9645c9884e91c3a92bfec64812850 (patch) | |
| tree | 809fef49a7e05ec995ae243db7bc725f3b487723 | |
| parent | a38af1f5ee3701035872e8b42444e628b759f1a2 (diff) | |
| download | freetype2-cb23fe6eeec9645c9884e91c3a92bfec64812850.tar.gz | |
* 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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | src/cff/cffgload.c | 9 | ||||
| -rw-r--r-- | src/cid/cidgload.c | 9 | ||||
| -rw-r--r-- | src/type1/t1gload.c | 9 |
4 files changed, 21 insertions, 12 deletions
@@ -1,3 +1,9 @@ +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> * src/type1/t1gload.c (T1_Load_Glyph), src/cff/cffgload.c diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index d9a10bc5c..43d684941 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -2442,12 +2442,13 @@ font_offset.y ); 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; FT_Vector_Transform( &advance, &font_matrix ); - advance.x += font_offset.x; - advance.y += font_offset.y; - metrics->horiAdvance = advance.x; - metrics->vertAdvance = advance.y; + metrics->vertAdvance = advance.y + font_offset.y; if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 ) { diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c index 913638864..e07fb717c 100644 --- a/src/cid/cidgload.c +++ b/src/cid/cidgload.c @@ -375,12 +375,13 @@ font_offset.y ); 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; FT_Vector_Transform( &advance, &font_matrix ); - advance.x += font_offset.x; - advance.y += font_offset.y; - metrics->horiAdvance = advance.x; - metrics->vertAdvance = advance.y; + metrics->vertAdvance = advance.y + font_offset.y; if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 ) { diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c index 49fb58984..b4573d60f 100644 --- a/src/type1/t1gload.c +++ b/src/type1/t1gload.c @@ -333,12 +333,13 @@ font_offset.y ); 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; FT_Vector_Transform( &advance, &font_matrix ); - advance.x += font_offset.x; - advance.y += font_offset.y; - metrics->horiAdvance = advance.x; - metrics->vertAdvance = advance.y; + metrics->vertAdvance = advance.y + font_offset.y; #endif if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 ) |