diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-05-11 11:37:59 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-05-11 11:54:38 (GMT) |
| commit | aeea8fd5a940787600002dda39a10dff4d19d090 (patch) | |
| tree | 90b1690366ac009d4676a32b0ba430953f5029ef /src | |
| parent | 92c5c75a9840853fad4f30235f9bf86dc7133fc4 (diff) | |
| download | Qt-aeea8fd5a940787600002dda39a10dff4d19d090.zip Qt-aeea8fd5a940787600002dda39a10dff4d19d090.tar.gz Qt-aeea8fd5a940787600002dda39a10dff4d19d090.tar.bz2 | |
Made QFontEngineFT compile on 64-bit platforms with legacy headers.
In older Freetype headers FT_LCD_FILTER_DEFAULT is apparently defined to
be ((const FT_Byte*)(void*)(ft_ptrdiff_t)1), which leads to a compile
error due to precision loss when casting to int.
Task-number: 253186
Reviewed-by: Trond
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qfontengine_ft.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp index 7a236fd..6f5ee1f 100644 --- a/src/gui/text/qfontengine_ft.cpp +++ b/src/gui/text/qfontengine_ft.cpp @@ -613,7 +613,7 @@ QFontEngineFT::QFontEngineFT(const QFontDef &fd) subpixelType = Subpixel_None; lcdFilterType = 0; #if defined(FT_LCD_FILTER_H) - lcdFilterType = (int) FT_LCD_FILTER_DEFAULT; + lcdFilterType = (int)((quintptr) FT_LCD_FILTER_DEFAULT); #endif defaultFormat = Format_None; canUploadGlyphsToServer = false; |