From 735aa7ff768f393f063f6ae9a79824b0e91b0aed Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 3 Apr 2006 20:13:17 +0000 Subject: 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). --- ChangeLog | 5 +++++ pango/opentype/harfbuzz-gdef.c | 3 --- pango/opentype/harfbuzz-gpos.c | 3 --- pango/opentype/harfbuzz-gsub.c | 3 --- pango/opentype/harfbuzz-impl.h | 11 +++++++++++ 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74f714d3..e0dc647e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +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). + 2006-04-03 Behdad Esfahbod Bug 337029 – pango/fonts.c: Illegal structure initialization diff --git a/pango/opentype/harfbuzz-gdef.c b/pango/opentype/harfbuzz-gdef.c index 1564e88c..9b81fc7b 100644 --- a/pango/opentype/harfbuzz-gdef.c +++ b/pango/opentype/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/pango/opentype/harfbuzz-gpos.c b/pango/opentype/harfbuzz-gpos.c index 8143eace..e75e1cc6 100644 --- a/pango/opentype/harfbuzz-gpos.c +++ b/pango/opentype/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/pango/opentype/harfbuzz-gsub.c b/pango/opentype/harfbuzz-gsub.c index 0a69fa6d..7610e1e2 100644 --- a/pango/opentype/harfbuzz-gsub.c +++ b/pango/opentype/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/pango/opentype/harfbuzz-impl.h b/pango/opentype/harfbuzz-impl.h index 78fb1ecc..15b63c68 100644 --- a/pango/opentype/harfbuzz-impl.h +++ b/pango/opentype/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])) -- cgit v1.2.1