shithub: freetype+ttf2subf

Download patch

ref: e52c4ba178c39c09dfa916b8b35bd59870a03b79
parent: e8ff769c7f3de0698a9e5c502b8b4a4e6b04bac8
author: Werner Lemberg <[email protected]>
date: Wed Aug 6 13:27:14 EDT 2003 

* 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.

git/fs: mount .git/fs: mount/attach disallowed 
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-06  Werner Lemberg  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* src/type1/t1gload.c (T1_Load_Glyph), src/cff/cffgload.c
--- 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 )
         {
--- 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 )
         {
--- 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 )