From ba0ccd5cfcb514cdc45373158343138b7b190f9d Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 1 Nov 2003 15:02:17 +0000 Subject: [PATCH] Switch over to recommended Freetype system of include ft2build.h then Sat Nov 1 09:32:15 2003 Owen Taylor * pango/pango-ot.h pango/pangofc-font.h modules/indic/indic-ot.h pango/pangoft2.c pango/opentype/pango-ot-info.c pango/opentype/pango-ot-ruleset.c pango/opentype/ottest.c pango/opentype/ftxopen.[ch] pango/opentype/ftxgdef.c pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: Switch over to recommended Freetype system of include ft2build.h then #include FT_FREETYPE_H. Fixes ftmodule.h problem with current Freetype CVS. (#125548) --- src/ftxgdef.c | 14 +++++++------- src/ftxgpos.c | 19 +++++++++---------- src/ftxgsub.c | 15 +++++++-------- src/ftxopen.c | 10 +++++----- src/ftxopen.h | 3 ++- src/ottest.c | 1 - src/pango-ot-info.c | 4 ++-- src/pango-ot-private.h | 2 -- src/pango-ot-ruleset.c | 4 ++-- 9 files changed, 34 insertions(+), 38 deletions(-) diff --git a/src/ftxgdef.c b/src/ftxgdef.c index c1d5b7974..d1cbda1e8 100644 --- a/src/ftxgdef.c +++ b/src/ftxgdef.c @@ -15,16 +15,16 @@ * ******************************************************************/ -#include - -#include -#include -#include +#include "ftxopen.h" +#include "ftxopenf.h" #include "fterrcompat.h" -#include "ftxopen.h" -#include "ftxopenf.h" +#include FT_TRUETYPE_TAGS_H + +#include FT_INTERNAL_STREAM_H +#include FT_INTERNAL_MEMORY_H +#include FT_INTERNAL_TRUETYPE_TYPES_H #define TTAG_GDEF FT_MAKE_TAG( 'G', 'D', 'E', 'F' ) diff --git a/src/ftxgpos.c b/src/ftxgpos.c index deebe89e9..8d9a7d483 100644 --- a/src/ftxgpos.c +++ b/src/ftxgpos.c @@ -21,19 +21,18 @@ sharing as much as possible with extensive use of macros. This is something for a volunteer :-) */ -#define TTAG_GPOS FT_MAKE_TAG( 'G', 'P', 'O', 'S' ) - -#include - -#include -#include -#include - -#include "fterrcompat.h" - #include "ftxopen.h" #include "ftxopenf.h" +#include "fterrcompat.h" + +#include FT_TRUETYPE_TAGS_H + +#include FT_INTERNAL_STREAM_H +#include FT_INTERNAL_MEMORY_H +#include FT_INTERNAL_TRUETYPE_TYPES_H + +#define TTAG_GPOS FT_MAKE_TAG( 'G', 'P', 'O', 'S' ) struct GPOS_Instance_ { diff --git a/src/ftxgsub.c b/src/ftxgsub.c index d9a77d635..96aaffa25 100644 --- a/src/ftxgsub.c +++ b/src/ftxgsub.c @@ -23,17 +23,16 @@ #define EXPORT_FUNC -#include - -#include -#include -#include - -#include "fterrcompat.h" - #include "ftxopen.h" #include "ftxopenf.h" +#include "fterrcompat.h" + +#include FT_TRUETYPE_TAGS_H + +#include FT_INTERNAL_STREAM_H +#include FT_INTERNAL_MEMORY_H +#include FT_INTERNAL_TRUETYPE_TYPES_H #define GSUB_ID Build_Extension_ID( 'G', 'S', 'U', 'B' ) diff --git a/src/ftxopen.c b/src/ftxopen.c index c9ac66036..2325f6a2c 100644 --- a/src/ftxopen.c +++ b/src/ftxopen.c @@ -15,14 +15,14 @@ * ******************************************************************/ -#include -#include -#include +#include "ftxopen.h" +#include "ftxopenf.h" #include "fterrcompat.h" -#include "ftxopen.h" -#include "ftxopenf.h" +#include FT_INTERNAL_STREAM_H +#include FT_INTERNAL_MEMORY_H +#include FT_INTERNAL_TRUETYPE_TYPES_H /*************************** diff --git a/src/ftxopen.h b/src/ftxopen.h index 84c85e76b..6788dec5f 100644 --- a/src/ftxopen.h +++ b/src/ftxopen.h @@ -22,7 +22,8 @@ #ifndef FTXOPEN_H #define FTXOPEN_H -#include +#include +#include FT_FREETYPE_H #ifdef __cplusplus extern "C" { diff --git a/src/ottest.c b/src/ottest.c index 4bc1a8e5b..b70f91189 100644 --- a/src/ottest.c +++ b/src/ottest.c @@ -23,7 +23,6 @@ #include #include "ftxopen.h" -#include #include "disasm.h" diff --git a/src/pango-ot-info.c b/src/pango-ot-info.c index 8827e6578..9a8754599 100644 --- a/src/pango-ot-info.c +++ b/src/pango-ot-info.c @@ -21,8 +21,8 @@ #include "pango-ot-private.h" #include "fterrcompat.h" -#include -#include +#include FT_INTERNAL_OBJECTS_H +#include FT_MODULE_H static void pango_ot_info_class_init (GObjectClass *object_class); static void pango_ot_info_finalize (GObject *object); diff --git a/src/pango-ot-private.h b/src/pango-ot-private.h index 782a7dde5..5c27f3a55 100644 --- a/src/pango-ot-private.h +++ b/src/pango-ot-private.h @@ -22,8 +22,6 @@ #ifndef __PANGO_OT_PRIVATE_H__ #define __PANGO_OT_PRIVATE_H__ -#include - #include #include diff --git a/src/pango-ot-ruleset.c b/src/pango-ot-ruleset.c index 756d0214c..996bd0416 100644 --- a/src/pango-ot-ruleset.c +++ b/src/pango-ot-ruleset.c @@ -19,11 +19,11 @@ * Boston, MA 02111-1307, USA. */ -#include - #include #include "pango-ot-private.h" +#include FT_INTERNAL_MEMORY_H /* For FT_Free() */ + #define PANGO_SCALE_26_6 (PANGO_SCALE / (1<<6)) #define PANGO_UNITS_26_6(d) (PANGO_SCALE_26_6 * (d))