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).
This commit is contained in:
Behdad Esfahbod 2006-04-03 20:13:17 +00:00 committed by Behdad Esfahbod
parent f618288e00
commit ca57250bc9
4 changed files with 11 additions and 9 deletions

View File

@ -14,9 +14,6 @@
#include "harfbuzz-gdef-private.h" #include "harfbuzz-gdef-private.h"
#include "harfbuzz-open-private.h" #include "harfbuzz-open-private.h"
#include FT_TRUETYPE_TAGS_H
static FT_Error Load_AttachList( HB_AttachList* al, static FT_Error Load_AttachList( HB_AttachList* al,
FT_Stream stream ); FT_Stream stream );
static FT_Error Load_LigCaretList( HB_LigCaretList* lcl, static FT_Error Load_LigCaretList( HB_LigCaretList* lcl,

View File

@ -15,9 +15,6 @@
#include "harfbuzz-open-private.h" #include "harfbuzz-open-private.h"
#include "harfbuzz-gdef-private.h" #include "harfbuzz-gdef-private.h"
#include FT_TRUETYPE_TAGS_H
struct GPOS_Instance_ struct GPOS_Instance_
{ {
HB_GPOSHeader* gpos; HB_GPOSHeader* gpos;

View File

@ -15,9 +15,6 @@
#include "harfbuzz-open-private.h" #include "harfbuzz-open-private.h"
#include "harfbuzz-gdef-private.h" #include "harfbuzz-gdef-private.h"
#include FT_TRUETYPE_TAGS_H
static FT_Error GSUB_Do_Glyph_Lookup( HB_GSUBHeader* gsub, static FT_Error GSUB_Do_Glyph_Lookup( HB_GSUBHeader* gsub,
FT_UShort lookup_index, FT_UShort lookup_index,
HB_Buffer buffer, HB_Buffer buffer,

View File

@ -15,6 +15,7 @@
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include FT_TRUETYPE_TAGS_H
FT_BEGIN_HEADER FT_BEGIN_HEADER
@ -30,6 +31,16 @@ FT_BEGIN_HEADER
# define TRUE 1 # define TRUE 1
#endif #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" #include "ftglue.h"
#define ARRAY_LEN(Array) ((int)(sizeof (Array) / sizeof (Array)[0])) #define ARRAY_LEN(Array) ((int)(sizeof (Array) / sizeof (Array)[0]))