summaryrefslogtreecommitdiff
path: root/lib/freetype/src
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2011-11-16 21:18:15 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2011-11-16 21:18:15 +0000
commit610e892d028fa3e89b281528463f4880823661b0 (patch)
treebb01dd27d242966be1f3ca99b9ce60b580a98136 /lib/freetype/src
parent719a93c880bb75189371605a0773a1f9b77ed26a (diff)
Commit the last bit of freetype 2.4.6 which I previously hold back,
since it changes the metrics of some TrueType fonts. Users of DejaVu at small sizes in xterm can use the 'scaleHeight' resource to restore the previous vertical spacing (with xterm 276 and later). Tested on a wide set of ports by ajachoutot@, naddy@, krw@ shadchin@.
Diffstat (limited to 'lib/freetype/src')
-rw-r--r--lib/freetype/src/truetype/ttdriver.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/freetype/src/truetype/ttdriver.c b/lib/freetype/src/truetype/ttdriver.c
index 66061fd3a..e70a61123 100644
--- a/lib/freetype/src/truetype/ttdriver.c
+++ b/lib/freetype/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;
}