From b9ff415dfbffb540c4b2df3671fc95fcb07caf66 Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Fri, 19 Nov 2004 10:35:52 +0000
Subject: [PATCH] Fix a serious bug in the TT hinter.

* src/truetype/ttgload.c (TT_Process_Simple_Glyph): Don't shift
points vertically before hinting.

* docs/CHANGES: Updated.

* src/cache/ftcglyph.c (FTC_GNode_UnselectFamily,
FTC_GCache_Lookup): A new try to fix comparison with zero.
---
 ChangeLog              | 12 ++++++++++++
 docs/CHANGES           |  2 ++
 src/cache/ftcglyph.c   |  4 ++--
 src/truetype/ttgload.c |  4 +---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eae1fcc83..a5818aaff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2004-11-19  Werner Lemberg  <wl@gnu.org>
+
+	Fix a serious bug in the TT hinter.
+
+	* src/truetype/ttgload.c (TT_Process_Simple_Glyph): Don't shift
+	points vertically before hinting.
+
+	* docs/CHANGES: Updated.
+
+	* src/cache/ftcglyph.c (FTC_GNode_UnselectFamily,
+	FTC_GCache_Lookup): A new try to fix comparison with zero.
+
 2004-11-16  Werner Lemberg  <wl@gnu.org>
 
 	* builds/unix/configure.ac: Add `-fno-strict-aliasing' if gcc is
diff --git a/docs/CHANGES b/docs/CHANGES
index da17bdc9e..84b65999b 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -13,6 +13,8 @@ LATEST CHANGES BETWEEN 2.1.10 and 2.1.9
       NPUSHW instruction wasn't skipped correctly in IF clauses.  Some
       fonts like `Helvetica 75 Bold' failed.
 
+    - Another bug in handling TrueType hints caused many distortions.
+
 
   II. IMPORTANT CHANGES
 
diff --git a/src/cache/ftcglyph.c b/src/cache/ftcglyph.c
index ede5c126e..46d5965b6 100644
--- a/src/cache/ftcglyph.c
+++ b/src/cache/ftcglyph.c
@@ -47,7 +47,7 @@
 
 
     gnode->family = NULL;
-    if ( family && --(FT_Long)(family->num_nodes) <= 0 )
+    if ( family && --family->num_nodes == 0 )
       FTC_FAMILY_FREE( family, cache );
   }
 
@@ -189,7 +189,7 @@
 
       error = FTC_Cache_Lookup( FTC_CACHE( cache ), hash, query, anode );
 
-      if ( --(FT_Long)(family->num_nodes) <= 0 )
+      if ( --family->num_nodes == 0 )
         FTC_FAMILY_FREE( family, cache );
     }
     return error;
diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c
index 572de844f..145ac98aa 100644
--- a/src/truetype/ttgload.c
+++ b/src/truetype/ttgload.c
@@ -797,12 +797,10 @@
     if ( IS_HINTED( load->load_flags ) )
     {
       FT_Pos  x = zone->org[n_points-4].x;
-      FT_Pos  y = zone->org[n_points-2].y;
 
 
       x = FT_PIX_ROUND( x ) - x;
-      y = FT_PIX_ROUND( y ) - y;
-      translate_array( n_points, zone->org, x, y );
+      translate_array( n_points, zone->org, x, 0 );
 
       org_to_cur( n_points, zone );