diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2019-06-16 02:38:02 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-06-19 10:55:23 +0200 |
| commit | 3d71431e5f7a100002cd2602af15ff661084dcbd (patch) | |
| tree | 072241c1663380d14740d2235daa3a88d5b925bf | |
| parent | 1039e636134b7267496ed74156e649e43d6456d1 (diff) | |
tdf#121486: Correct scale of broken fonts on Windows
Some fonts have negative tmAveCharWidth which makes no sense (fonts can't have
negative glyph width, so the average can't be negative) and it would cause our
code to apply negative scale to the glyphs of these fonts making them drawn on
the flipped horizontally.
Fix this by using the absolute value so it is always positive.
Change-Id: I731e7aad80dae734847679a1b08c6ac78111e16c
Reviewed-on: https://gerrit.libreoffice.org/74109
Tested-by: Jenkins
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
(cherry picked from commit 8fffb56940c6eb81674000cdb718edc79603a6c5)
Reviewed-on: https://gerrit.libreoffice.org/74123
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
(cherry picked from commit cd33eb812277f516f4670edfffd68e5b763e8a4c)
| -rw-r--r-- | vcl/inc/fontinstance.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx index 58bcd07927a0..f8199669952f 100644 --- a/vcl/inc/fontinstance.hxx +++ b/vcl/inc/fontinstance.hxx @@ -63,7 +63,7 @@ public: // TODO: make data members private void IgnoreFallbackForUnicode( sal_UCS4, FontWeight eWeight, const OUString& rFontName ); inline hb_font_t* GetHbFont(); - void SetAverageWidthFactor(double nFactor) { m_nAveWidthFactor = nFactor; } + void SetAverageWidthFactor(double nFactor) { m_nAveWidthFactor = std::abs(nFactor); } double GetAverageWidthFactor() const { return m_nAveWidthFactor; } const FontSelectPattern& GetFontSelectPattern() const { return m_aFontSelData; } |