summaryrefslogtreecommitdiff
path: root/core/fxge/cfx_fontmgr.cpp
diff options
context:
space:
mode:
authorAndrew Weintraub <asweintraub@google.com>2018-01-08 16:42:34 -0500
committerChromium commit bot <commit-bot@chromium.org>2018-01-09 08:13:55 +0000
commit133542fbe7c01dd296d6ffd205281702ad914506 (patch)
treec64a4a24d28f3f58ea0e5c62abb8af8ae0add0b0 /core/fxge/cfx_fontmgr.cpp
parent93c0f344d8c568535bd56d591b3d42050c71676a (diff)
downloadpdfium-133542fbe7c01dd296d6ffd205281702ad914506.tar.xz
Fix cl/22012 to always call FXFT_Library_SetLcdFilter so that we render properly regardless of whether "Harmony" is built in.
Bug: Change-Id: I37bf8161d758e8789f81956ea28598480908b47f Reviewed-on: https://pdfium-review.googlesource.com/22451 Commit-Queue: Lei Zhang <thestig@chromium.org> Reviewed-by: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core/fxge/cfx_fontmgr.cpp')
-rw-r--r--core/fxge/cfx_fontmgr.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/fxge/cfx_fontmgr.cpp b/core/fxge/cfx_fontmgr.cpp
index 0d4524c954..c6521175fb 100644
--- a/core/fxge/cfx_fontmgr.cpp
+++ b/core/fxge/cfx_fontmgr.cpp
@@ -105,10 +105,10 @@ void CFX_FontMgr::InitFTLibrary() {
// Freetype versions >= 2.8.1 support hinting even if subpixel rendering is
// disabled. https://sourceforge.net/projects/freetype/files/freetype2/2.8.1/
m_FTLibrarySupportsHinting =
- major > 2 || (major >= 2 && minor > 8) ||
- (major >= 2 && minor >= 8 && patch >= 1) ||
FXFT_Library_SetLcdFilter(m_FTLibrary, FT_LCD_FILTER_DEFAULT) !=
- FT_Err_Unimplemented_Feature;
+ FT_Err_Unimplemented_Feature ||
+ major > 2 || (major >= 2 && minor > 8) ||
+ (major >= 2 && minor >= 8 && patch >= 1);
}
void CFX_FontMgr::SetSystemFontInfo(