From 50cd0daf29d434b78cc70bbf732ee33b2bc18600 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Wed, 25 Nov 2015 13:47:27 +0100 Subject: Fix kerned advances in QRawFont on OS X and Windows On Windows, the wrong value was used to calculate the design-to-device scale. The assumption has been that tmHeight in the TEXTMETRIC is the pixel size of the em square, but it is not, it's the height of the font (ascent + descent). The pixel size of the font is defined to be the em square size in pixels. On OS X, the kerning data was never actually read from the font. I've added a lazy initialization for this similar to the one in the FT engine. This was discovered when investigating QTBUG-48546, as it turned out that the kerning information extracted by Qt in this case was different from the one used by Harfbuzz. I've changed testfont.ttf to kern "_2" so that the digit is positioned directly on top of the underscore and constructed a test. [ChangeLog][QRawFont] Fixed kerning on advances in QRawFont for OS X and Windows. Change-Id: Ic9a321ad119ea880cef89b861c75a820ab8d3182 Reviewed-by: Konstantin Ritt --- tests/auto/shared/resources/testfont.ttf | Bin 63212 -> 78432 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'tests/auto/shared/resources') diff --git a/tests/auto/shared/resources/testfont.ttf b/tests/auto/shared/resources/testfont.ttf index d6042d2e58..93b728c776 100644 Binary files a/tests/auto/shared/resources/testfont.ttf and b/tests/auto/shared/resources/testfont.ttf differ -- cgit v1.2.3