Commit bf02d396ca98b51fe5026fffdb43953d26959ac0

Werner Lemberg 2007-01-10T07:07:37

* src/type1/t1load.c (T1_Get_MM_Var): Always return fixed point values.

diff --git a/ChangeLog b/ChangeLog
index 65553aa..dd291d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-10  Derek Clegg  <dclegg@apple.com>
+
+	* src/type1/t1load.c (T1_Get_MM_Var): Always return fixed point
+	values.
+
 2007-01-08  David Turner  <david@freetype.org>
 
 	* docs/CHANGES: Updated.
diff --git a/src/type1/t1load.c b/src/type1/t1load.c
index 70b9f20..8efd5fa 100644
--- a/src/type1/t1load.c
+++ b/src/type1/t1load.c
@@ -4,7 +4,7 @@
 /*                                                                         */
 /*    Type 1 font loader (body).                                           */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by                   */
+/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by             */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
@@ -355,8 +355,9 @@
                         blend->num_axis );
 
       for ( i = 0; i < mmaster.num_axis; ++i )
-        mmvar->axis[i].def = mm_axis_unmap( &blend->design_map[i],
-                                            axiscoords[i] );
+        mmvar->axis[i].def =
+          FT_INT_TO_FIXED( mm_axis_unmap( &blend->design_map[i],
+                                          axiscoords[i] ) );
     }
 
     *master = mmvar;