From 6eaaaa3ed4157df021e99146422fd8634c63ecd5 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 15 Jan 2016 15:31:12 -0800 Subject: Merge to XFA: Fix the way FT headers are included FreeType headers have to be included with macros defined in ftheaders.h. Not doing so breaks when the FreeType header location changes as was the case between FreeType 2.6.0 and 2.6.2. Patch by jshin@chromium.org BUG=pdfium:362 TBR=jshin@chromium.org, tsepez@chromium.org Review URL: https://codereview.chromium.org/1587333002 . (cherry picked from commit 56461d66054c53fe3abc88208eaf5d84e80e6551) Review URL: https://codereview.chromium.org/1585233004 . --- core/include/fxge/fx_freetype.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/core/include/fxge/fx_freetype.h b/core/include/fxge/fx_freetype.h index c7c8295961..5721784eb7 100644 --- a/core/include/fxge/fx_freetype.h +++ b/core/include/fxge/fx_freetype.h @@ -8,12 +8,13 @@ #define CORE_INCLUDE_FXGE_FX_FREETYPE_H_ #include -#include -#include -#include -#include -#include -#include +#include FT_FREETYPE_H +#include FT_GLYPH_H +#include FT_LCD_FILTER_H +#include FT_MULTIPLE_MASTERS_H +#include FT_OUTLINE_H +#include FT_TRUETYPE_TABLES_H + #ifdef __cplusplus extern "C" { #endif -- cgit v1.2.3