From 8f9b7f50a513675e9a907ae4393d8d914635a23d Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sat, 29 Nov 2008 17:35:58 +0000 Subject: [PATCH] * src/type/t1load.c (mm_axis_unmap): Revert previous patch and fix it correctly by using FT_INT_TO_FIXED (FreeType expects 16.16 values in the /BlendDesignMap space). --- ChangeLog | 6 ++++++ src/type1/t1load.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index aebc72263..0397d119e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-11-29 James Cloos + + * src/type/t1load.c (mm_axis_unmap): Revert previous patch and fix + it correctly by using FT_INT_TO_FIXED (FreeType expects 16.16 values + in the /BlendDesignMap space). + 2008-11-29 James Cloos * src/type1/t1load.c (mm_axis_unmap): `blend_points' is FT_Fixed*, diff --git a/src/type1/t1load.c b/src/type1/t1load.c index 7a98302a8..ccd17f334 100644 --- a/src/type1/t1load.c +++ b/src/type1/t1load.c @@ -230,7 +230,7 @@ if ( ncv <= axismap->blend_points[0] ) - return axismap->blend_points[0]; + return FT_INT_TO_FIXED( axismap->design_points[0] ); for ( j = 1; j < axismap->num_points; ++j ) { @@ -249,7 +249,7 @@ } } - return axismap->blend_points[axismap->num_points - 1]; + return FT_INT_TO_FIXED( axismap->design_points[axismap->num_points - 1] ); }