From 4b9e16f27a2944eacfbdb4eddd3b6b91c0482ba3 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 1 Nov 2003 15:03:01 +0000 Subject: 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/pangoft2.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) --- ChangeLog | 12 ++++++++++++ ChangeLog.pre-1-10 | 12 ++++++++++++ ChangeLog.pre-1-4 | 12 ++++++++++++ ChangeLog.pre-1-6 | 12 ++++++++++++ ChangeLog.pre-1-8 | 12 ++++++++++++ modules/indic/indic-ot.h | 1 - pango/opentype/ftxgdef.c | 14 +++++++------- pango/opentype/ftxgpos.c | 17 ++++++++--------- pango/opentype/ftxgsub.c | 13 ++++++------- pango/opentype/ftxopen.c | 10 +++++----- pango/opentype/ftxopen.h | 3 ++- pango/opentype/ottest.c | 1 - pango/opentype/pango-ot-info.c | 4 ++-- pango/opentype/pango-ot-private.h | 2 -- pango/opentype/pango-ot-ruleset.c | 4 ++-- pango/pango-ot.h | 3 ++- pango/pangoft2.c | 2 -- pango/pangoft2.h | 3 ++- 18 files changed, 96 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9496bf06..19eddcd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Sat Nov 1 09:32:15 2003 Owen Taylor + + * pango/pango-ot.h pango/pangoft2.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) + Fri Oct 31 12:32:38 2003 Owen Taylor Fix one problem with iteration by chars (Part of diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 9496bf06..19eddcd5 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,15 @@ +Sat Nov 1 09:32:15 2003 Owen Taylor + + * pango/pango-ot.h pango/pangoft2.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) + Fri Oct 31 12:32:38 2003 Owen Taylor Fix one problem with iteration by chars (Part of diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 9496bf06..19eddcd5 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,15 @@ +Sat Nov 1 09:32:15 2003 Owen Taylor + + * pango/pango-ot.h pango/pangoft2.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) + Fri Oct 31 12:32:38 2003 Owen Taylor Fix one problem with iteration by chars (Part of diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 9496bf06..19eddcd5 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,15 @@ +Sat Nov 1 09:32:15 2003 Owen Taylor + + * pango/pango-ot.h pango/pangoft2.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) + Fri Oct 31 12:32:38 2003 Owen Taylor Fix one problem with iteration by chars (Part of diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 9496bf06..19eddcd5 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,15 @@ +Sat Nov 1 09:32:15 2003 Owen Taylor + + * pango/pango-ot.h pango/pangoft2.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) + Fri Oct 31 12:32:38 2003 Owen Taylor Fix one problem with iteration by chars (Part of diff --git a/modules/indic/indic-ot.h b/modules/indic/indic-ot.h index caf229d4..28c354d4 100644 --- a/modules/indic/indic-ot.h +++ b/modules/indic/indic-ot.h @@ -9,7 +9,6 @@ #ifndef __INDIC_OT_H__ #define __INDIC_OT_H__ -#include #include #include #include "mprefixups.h" diff --git a/pango/opentype/ftxgdef.c b/pango/opentype/ftxgdef.c index c1d5b797..d1cbda1e 100644 --- a/pango/opentype/ftxgdef.c +++ b/pango/opentype/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/pango/opentype/ftxgpos.c b/pango/opentype/ftxgpos.c index deebe89e..8d9a7d48 100644 --- a/pango/opentype/ftxgpos.c +++ b/pango/opentype/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 "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_GPOS FT_MAKE_TAG( 'G', 'P', 'O', 'S' ) struct GPOS_Instance_ { diff --git a/pango/opentype/ftxgsub.c b/pango/opentype/ftxgsub.c index d9a77d63..96aaffa2 100644 --- a/pango/opentype/ftxgsub.c +++ b/pango/opentype/ftxgsub.c @@ -23,17 +23,16 @@ #define EXPORT_FUNC -#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 GSUB_ID Build_Extension_ID( 'G', 'S', 'U', 'B' ) diff --git a/pango/opentype/ftxopen.c b/pango/opentype/ftxopen.c index c9ac6603..2325f6a2 100644 --- a/pango/opentype/ftxopen.c +++ b/pango/opentype/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/pango/opentype/ftxopen.h b/pango/opentype/ftxopen.h index 84c85e76..6788dec5 100644 --- a/pango/opentype/ftxopen.h +++ b/pango/opentype/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/pango/opentype/ottest.c b/pango/opentype/ottest.c index c6338e96..b245252c 100644 --- a/pango/opentype/ottest.c +++ b/pango/opentype/ottest.c @@ -23,7 +23,6 @@ #include #include "ftxopen.h" -#include #include "disasm.h" diff --git a/pango/opentype/pango-ot-info.c b/pango/opentype/pango-ot-info.c index 8827e657..9a875459 100644 --- a/pango/opentype/pango-ot-info.c +++ b/pango/opentype/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/pango/opentype/pango-ot-private.h b/pango/opentype/pango-ot-private.h index 782a7dde..5c27f3a5 100644 --- a/pango/opentype/pango-ot-private.h +++ b/pango/opentype/pango-ot-private.h @@ -22,8 +22,6 @@ #ifndef __PANGO_OT_PRIVATE_H__ #define __PANGO_OT_PRIVATE_H__ -#include - #include #include diff --git a/pango/opentype/pango-ot-ruleset.c b/pango/opentype/pango-ot-ruleset.c index 756d0214..996bd041 100644 --- a/pango/opentype/pango-ot-ruleset.c +++ b/pango/opentype/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)) diff --git a/pango/pango-ot.h b/pango/pango-ot.h index c2dabf01..093f2282 100644 --- a/pango/pango-ot.h +++ b/pango/pango-ot.h @@ -22,7 +22,8 @@ #ifndef __PANGO_OT_H__ #define __PANGO_OT_H__ -#include +#include +#include FT_FREETYPE_H #include G_BEGIN_DECLS diff --git a/pango/pangoft2.c b/pango/pangoft2.c index 7213da02..e5eb15a1 100644 --- a/pango/pangoft2.c +++ b/pango/pangoft2.c @@ -28,8 +28,6 @@ #include #include -#include - #include "pango-utils.h" #include "pangoft2.h" #include "pangoft2-private.h" diff --git a/pango/pangoft2.h b/pango/pangoft2.h index 10dc143c..62568873 100644 --- a/pango/pangoft2.h +++ b/pango/pangoft2.h @@ -23,7 +23,8 @@ #ifndef __PANGOFT2_H__ #define __PANGOFT2_H__ -#include +#include +#include FT_FREETYPE_H #include -- cgit v1.2.1