summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Chu <steven.f.chu@gmail.com>2011-07-16 09:12:42 +0200
committerWerner Lemberg <wl@gnu.org>2011-07-16 09:12:42 +0200
commitb0962ac34e66052ccfee7996e5468f30d4bd5a72 (patch)
tree94a77afa330beb8d537ea068c2fcc611b01bda39
parent143799d4a95e38eab1e49c761d3c6f116fd80349 (diff)
downloadfreetype2-b0962ac34e66052ccfee7996e5468f30d4bd5a72.tar.gz
[truetype] Fix metrics on size request for scalable fonts.
* src/truetype/ttdriver.c (tt_size_request): Fix copying metrics from TT_Size to FT_Size if scalable font.
-rw-r--r--ChangeLog7
-rw-r--r--src/truetype/ttdriver.c3
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 0eea382..9667b87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-07-16 Steven Chu <steven.f.chu@gmail.com>
+
+ [truetype] Fix metrics on size request for scalable fonts.
+
+ * src/truetype/ttdriver.c (tt_size_request): Fix copying metrics
+ from TT_Size to FT_Size if scalable font.
+
2011-07-14 Matthias Drochner <M.Drochner@fz-juelich.de>.
[psaux] Fix potential sign extension problems.
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index 66061fd..e70a611 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -246,7 +246,10 @@
FT_Request_Metrics( size->face, req );
if ( FT_IS_SCALABLE( size->face ) )
+ {
error = tt_size_reset( ttsize );
+ ttsize->root.metrics = ttsize->metrics;
+ }
return error;
}