From 610e892d028fa3e89b281528463f4880823661b0 Mon Sep 17 00:00:00 2001 From: Matthieu Herrb Date: Wed, 16 Nov 2011 21:18:15 +0000 Subject: 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@. --- lib/freetype/src/truetype/ttdriver.c | 3 +++ 1 file changed, 3 insertions(+) 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; } -- cgit v1.2.3