commit ea815d93086e3d6d743c1d22fb7e83fb4d41c32a
author Jean-Baptiste Queru <jbq@google.com> Sun Nov 15 12:05:48 2009 -0800
committer Jean-Baptiste Queru <jbq@google.com> Sun Nov 15 12:05:48 2009 -0800
tree 0fb281d1f2c9b5983c59359c272e6eb8cf4826b5
parent dc280eeb0aa3d55aaf6584c86623bf999ebd1736
parent 0c250419df978255ad31e91dd82174b1ceb54542

merge from eclair

Android.mk

diff --git a/Android.mk b/Android.mk
index 70b2e46..ee6f253 100644
--- a/Android.mk
+++ b/Android.mk
@@ -50,11 +50,6 @@
 LOCAL_CFLAGS += "-DFT_DEBUG_MEMORY"
 endif
 
-# the following activates the new experimental auto-hinter
-# one that should create less problems with a wide variety
-# of glyphs, including our double-decker "g"
-#LOCAL_CFLAGS += -DFT_OPTION_AUTOFIT2
-
 # the following is for testing only, and should not be used in final builds
 # of the product
 #LOCAL_CFLAGS += "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
@@ -65,4 +60,3 @@
 
 include $(BUILD_STATIC_LIBRARY)
 endif
-

src/autofit/afcjk.c

diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c
index fabe921..de3ce11 100644
--- a/src/autofit/afcjk.c
+++ b/src/autofit/afcjk.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Auto-fitter hinting routines for CJK script (body).                  */
 /*                                                                         */
-/*  Copyright 2006, 2007 by                                                */
+/*  Copyright 2006, 2007, 2008 by                                          */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -1253,10 +1253,15 @@
         else if ( after >= edge_limit )
           af_cjk_align_serif_edge( hints, before, edge );
         else
-          edge->pos = before->pos +
-            FT_MulDiv( edge->fpos - before->fpos,
-                       after->pos - before->pos,
-                       after->fpos - before->fpos );
+        {
+          if ( after->fpos == before->fpos )
+            edge->pos = before->pos;
+          else
+            edge->pos = before->pos +
+                        FT_MulDiv( edge->fpos - before->fpos,
+                                   after->pos - before->pos,
+                                   after->fpos - before->fpos );
+        }
       }
     }
   }

src/autofit/aflatin.c

diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c
index 09f9a98..ba59e5b 100644
--- a/src/autofit/aflatin.c
+++ b/src/autofit/aflatin.c
@@ -2008,7 +2008,10 @@
           if ( before >= edges && before < edge   &&
                after < edge_limit && after > edge )
           {
-            edge->pos = before->pos +
+            if ( after->opos == before->opos )
+              edge->pos = before->pos;
+            else
+              edge->pos = before->pos +
                           FT_MulDiv( edge->opos - before->opos,
                                      after->pos - before->pos,
                                      after->opos - before->opos );