From cdb6e70a36ce10401f9914e3cdb639e6ba1b460d Mon Sep 17 00:00:00 2001
From: Werner Lemberg <wl@gnu.org>
Date: Mon, 26 Apr 2004 08:09:30 +0000
Subject: [PATCH] * src/truetype/ttgxvar.c (ft_var_apply_tuple): Fix typo.
* src/truetype/Jamfile, docs/CHANGES: Updated.
---
ChangeLog | 8 ++++++++
docs/CHANGES | 8 ++++++++
src/truetype/Jamfile | 4 ++--
src/truetype/ttgxvar.c | 2 +-
4 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 6687651ca..2ab420d04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-25 George Williams <gww@silcom.com>
+
+ * src/truetype/ttgxvar.c (ft_var_apply_tuple): Fix typo.
+
+2004-04-25 Werner Lemberg <wl@gnu.org>
+
+ * src/truetype/Jamfile, docs/CHANGES: Updated.
+
2004-04-24 Werner Lemberg <wl@gnu.org>
* src/pcf/pcfdrivr.c: Revert change from 2004-04-17.
diff --git a/docs/CHANGES b/docs/CHANGES
index 6daf3284e..ee61c283f 100644
--- a/docs/CHANGES
+++ b/docs/CHANGES
@@ -9,6 +9,14 @@ LATEST CHANGES BETWEEN 2.1.9 and 2.1.8
cmap caches.)
+ II. IMPORTANT CHANGES
+
+ - George Williams contributed code to handle Apple's font
+ distortion technology found in GX fonts (`avar', `cvar', `fvar',
+ and `gvar' tables; the Multiple Masters API has been slightly
+ extended to cope with the new functionality.
+
+
======================================================================
LATEST CHANGES BETWEEN 2.1.8 and 2.1.7
diff --git a/src/truetype/Jamfile b/src/truetype/Jamfile
index f847f6f0f..bb7e05e6e 100644
--- a/src/truetype/Jamfile
+++ b/src/truetype/Jamfile
@@ -1,4 +1,4 @@
-# FreeType 2 src/truetype Jamfile (c) 2001 David Turner
+# FreeType 2 src/truetype Jamfile (c) 2001, 2004 David Turner
#
SubDir FT2_TOP $(FT2_SRC_DIR) truetype ;
@@ -8,7 +8,7 @@ SubDir FT2_TOP $(FT2_SRC_DIR) truetype ;
if $(FT2_MULTI)
{
- _sources = ttdriver ttobjs ttpload ttgload ttinterp ;
+ _sources = ttdriver ttobjs ttpload ttgload ttinterp ttgxvar ;
}
else
{
diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c
index 76bd07ec9..e81f4df99 100644
--- a/src/truetype/ttgxvar.c
+++ b/src/truetype/ttgxvar.c
@@ -516,7 +516,7 @@
apply = FT_MulDiv( apply,
blend->normalizedcoords[i] > 0
? blend->normalizedcoords[i]
- : blend->normalizedcoords[i],
+ : -blend->normalizedcoords[i],
0x10000L );
else if ( blend->normalizedcoords[i] <= im_start_coords[i] ||