From ef4dce44bb4b990f301a98853075f501c6f053d7 Mon Sep 17 00:00:00 2001 From: John Abd-El-Malek Date: Mon, 2 Feb 2015 16:52:07 -0800 Subject: Merge the following changes to XFA branch: b3a788e Fix GN PDFium build when building all. by John Abd-El-Malek - 19 hours ago chromium/2293 f8af677 Always use the FreeType headers included in PDFium. by John Abd-El-Malek - 24 hours ago dc8c950 Don't export any OpenJPEG methods from PDFium. by John Abd-El-Malek - 3 days ago 71c24b8 Use system FreeType on Linux. by John Abd-El-Malek - 3 days ago R=tsepez@chromium.org Review URL: https://codereview.chromium.org/900433002 --- core/include/fxge/fx_freetype.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'core/include/fxge') diff --git a/core/include/fxge/fx_freetype.h b/core/include/fxge/fx_freetype.h index 6419c6b6c2..4b49d5f6ea 100644 --- a/core/include/fxge/fx_freetype.h +++ b/core/include/fxge/fx_freetype.h @@ -4,12 +4,13 @@ // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com -#include "../../../third_party/freetype/include/ft2build.h" -#include "../../../third_party/freetype/include/freetype.h" -#include "../../../third_party/freetype/include/ftoutln.h" -#include "../../../third_party/freetype/include/ftmm.h" -#include "../../../third_party/freetype/include/internal/ftobjs.h" -#include "../../../third_party/freetype/include/tttables.h" +#include +#include +#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" { #endif @@ -111,8 +112,6 @@ typedef FT_CharMap FXFT_CharMap; #define FXFT_Get_MM_Axis_Min(axis) ((FT_Var_Axis*)axis)->minimum #define FXFT_Get_MM_Axis_Max(axis) ((FT_Var_Axis*)axis)->maximum #define FXFT_Get_MM_Axis_Def(axis) ((FT_Var_Axis*)axis)->def -#define FXFT_Get_Face_Internal_Flag(face) ((FT_Face)face)->internal->transform_flags -#define FXFT_Set_Face_Internal_Flag(face, flag) (((FT_Face)face)->internal->transform_flags = flag) #define FXFT_Alloc(library, size) ((FT_Library)library)->memory->alloc(((FT_Library)library)->memory, size) #define FXFT_Free(face, p) ((FT_Face)face)->memory->free(((FT_Face)face)->memory, p) #define FXFT_Get_Glyph_Outline(face) &((FT_Face)face)->glyph->outline -- cgit v1.2.3