From 133542fbe7c01dd296d6ffd205281702ad914506 Mon Sep 17 00:00:00 2001 From: Andrew Weintraub Date: Mon, 8 Jan 2018 16:42:34 -0500 Subject: 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 Reviewed-by: Lei Zhang --- core/fxge/cfx_fontmgr.cpp | 6 +++--- 1 file 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( -- cgit v1.2.3