path: root/src/gui/text/qfontengine_ft_p.h
diff options
authorJian Liang <>2016-04-28 22:14:20 +0800
committerjian liang <>2016-04-29 09:10:32 +0000
commitd2304a28ca657634253af26ad803c7f292e6f4cc (patch)
treefbd8db9f837e6988f5b74852a2e875d1619ab064 /src/gui/text/qfontengine_ft_p.h
parentc8e4d15004bade8b99aaf74b6f899911b5d66962 (diff)
Change some members of QFontEngineFT::Glyph to short
Some color bitmap fonts will have a size greater than 127 pixels, areMetricsTooLarge() will return true(its advance exceed 127) for these fonts and we are unable to render these fonts since QFontEngineFT::loadGlyph() will simply do nothing if areMetricsTooLarge() return true. To support bitmap font whose size is between 128 and 255, we change x,y,advance of QFontEngineFT::Glyph to short variable to make areMetricsTooLarge() return false, in this way we will be able to render such color bitmap fonts. Change-Id: I9ab244b14884cdde91040a462f2fbca650b91289 Reviewed-by: Konstantin Ritt <> Reviewed-by: Eskil Abrahamsen Blomfeldt <>
Diffstat (limited to 'src/gui/text/qfontengine_ft_p.h')
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h
index 3421c873d5..ee2df6f665 100644
--- a/src/gui/text/qfontengine_ft_p.h
+++ b/src/gui/text/qfontengine_ft_p.h
@@ -140,9 +140,9 @@ public:
short linearAdvance;
unsigned char width;
unsigned char height;
- signed char x;
- signed char y;
- signed char advance;
+ short x;
+ short y;
+ short advance;
signed char format;
uchar *data;