From ca57250bc9d9f92c88a2ea516e251b9cbfdebda0 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 3 Apr 2006 20:13:17 +0000 Subject: [PATCH] Make sure TTAG_GDEF and frineds are defined, needed for FreeType <= 2.1.7 2006-04-03 Behdad Esfahbod * pango/opentype/harfbuzz-impl.h: Make sure TTAG_GDEF and frineds are defined, needed for FreeType <= 2.1.7 (pointed by Tim Janik). --- src/harfbuzz-gdef.c | 3 --- src/harfbuzz-gpos.c | 3 --- src/harfbuzz-gsub.c | 3 --- src/harfbuzz-impl.h | 11 +++++++++++ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/harfbuzz-gdef.c b/src/harfbuzz-gdef.c index 1564e88..9b81fc7 100644 --- a/src/harfbuzz-gdef.c +++ b/src/harfbuzz-gdef.c @@ -14,9 +14,6 @@ #include "harfbuzz-gdef-private.h" #include "harfbuzz-open-private.h" -#include FT_TRUETYPE_TAGS_H - - static FT_Error Load_AttachList( HB_AttachList* al, FT_Stream stream ); static FT_Error Load_LigCaretList( HB_LigCaretList* lcl, diff --git a/src/harfbuzz-gpos.c b/src/harfbuzz-gpos.c index 8143eac..e75e1cc 100644 --- a/src/harfbuzz-gpos.c +++ b/src/harfbuzz-gpos.c @@ -15,9 +15,6 @@ #include "harfbuzz-open-private.h" #include "harfbuzz-gdef-private.h" -#include FT_TRUETYPE_TAGS_H - - struct GPOS_Instance_ { HB_GPOSHeader* gpos; diff --git a/src/harfbuzz-gsub.c b/src/harfbuzz-gsub.c index 0a69fa6..7610e1e 100644 --- a/src/harfbuzz-gsub.c +++ b/src/harfbuzz-gsub.c @@ -15,9 +15,6 @@ #include "harfbuzz-open-private.h" #include "harfbuzz-gdef-private.h" -#include FT_TRUETYPE_TAGS_H - - static FT_Error GSUB_Do_Glyph_Lookup( HB_GSUBHeader* gsub, FT_UShort lookup_index, HB_Buffer buffer, diff --git a/src/harfbuzz-impl.h b/src/harfbuzz-impl.h index 78fb1ec..15b63c6 100644 --- a/src/harfbuzz-impl.h +++ b/src/harfbuzz-impl.h @@ -15,6 +15,7 @@ #include #include FT_FREETYPE_H +#include FT_TRUETYPE_TAGS_H FT_BEGIN_HEADER @@ -30,6 +31,16 @@ FT_BEGIN_HEADER # define TRUE 1 #endif +#ifndef TTAG_GDEF +# define TTAG_GDEF FT_MAKE_TAG( 'G', 'D', 'E', 'F' ) +#endif +#ifndef TTAG_GPOS +# define TTAG_GPOS FT_MAKE_TAG( 'G', 'P', 'O', 'S' ) +#endif +#ifndef TTAG_GSUB +# define TTAG_GSUB FT_MAKE_TAG( 'G', 'S', 'U', 'B' ) +#endif + #include "ftglue.h" #define ARRAY_LEN(Array) ((int)(sizeof (Array) / sizeof (Array)[0])) -- 2.7.4