summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Lemberg <wl@gnu.org>2007-01-10 07:07:37 +0000
committerWerner Lemberg <wl@gnu.org>2007-01-10 07:07:37 +0000
commitbf02d396ca98b51fe5026fffdb43953d26959ac0 (patch)
tree9135b155fd18a71c715ac7bbb30fbb03f0d1f0db
parentcc7f12a42963e39d59d9b654572b2ba8bae47c11 (diff)
* src/type1/t1load.c (T1_Get_MM_Var): Always return fixed point
values.
-rw-r--r--ChangeLog5
-rw-r--r--src/type1/t1load.c7
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 65553aad..dd291d6a 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 70b9f200..8efd5fa5 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;