diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-04-03 20:13:17 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-04-03 20:13:17 +0000 |
| commit | 735aa7ff768f393f063f6ae9a79824b0e91b0aed (patch) | |
| tree | b7eb799b330044dd842f3fa042553523885da9bf | |
| parent | 8cad7c0a1b8126c9cb54b2eb5588dfa88a28dbed (diff) | |
| download | pango-735aa7ff768f393f063f6ae9a79824b0e91b0aed.tar.gz | |
Make sure TTAG_GDEF and frineds are defined, needed for FreeType <= 2.1.7
2006-04-03 Behdad Esfahbod <behdad@gnome.org>
* pango/opentype/harfbuzz-impl.h: Make sure TTAG_GDEF and frineds are
defined, needed for FreeType <= 2.1.7 (pointed by Tim Janik).
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | pango/opentype/harfbuzz-gdef.c | 3 | ||||
| -rw-r--r-- | pango/opentype/harfbuzz-gpos.c | 3 | ||||
| -rw-r--r-- | pango/opentype/harfbuzz-gsub.c | 3 | ||||
| -rw-r--r-- | pango/opentype/harfbuzz-impl.h | 11 |
5 files changed, 16 insertions, 9 deletions
@@ -1,5 +1,10 @@ 2006-04-03 Behdad Esfahbod <behdad@gnome.org> + * 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 <behdad@gnome.org> + Bug 337029 – pango/fonts.c: Illegal structure initialization * pango/fonts.c: Change NULL's to ""'s after previous change, and fix 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 <ft2build.h> #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])) |