diff options
| author | Jungshik Shin <jungshik@google.com> | 2016-01-14 14:21:23 -0800 |
|---|---|---|
| committer | jungshik <jungshik@google.com> | 2016-01-14 22:53:50 +0000 |
| commit | 8766bf6bc58c38a3b67646725e4d19825e3cdbe8 (patch) | |
| tree | 1b967f13d664b623901d452edd768761f5b28255 | |
| parent | 09f9bb78dc64819a5170915ef4b7c086d07d97fb (diff) | |
| download | pdfium-8766bf6bc58c38a3b67646725e4d19825e3cdbe8.tar.gz | |
Fix the way FT headers are included in pdfium
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.
This issue blocks updating FreeType to 2.6.2.
An upstream bug was filed :
https://bugs.chromium.org/p/pdfium/issues/detail?id=362
BUG=24296662
Change-Id: I095d4a67d39aa86433e51360e12b19c2b2346733
Signed-off-by: Jungshik Shin <jungshik@google.com>
| -rw-r--r-- | core/include/fxge/fx_freetype.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/core/include/fxge/fx_freetype.h b/core/include/fxge/fx_freetype.h index 6975ead29..7ad981205 100644 --- a/core/include/fxge/fx_freetype.h +++ b/core/include/fxge/fx_freetype.h @@ -8,12 +8,12 @@ #define CORE_INCLUDE_FXGE_FX_FREETYPE_H_ #include <ft2build.h> -#include <freetype.h> -#include <ftglyph.h> -#include <ftlcdfil.h> -#include <ftmm.h> -#include <ftoutln.h> -#include <tttables.h> +#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 |