walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch over to recommended Freetype system of include ft2build.h then 

Sat Nov  1 09:32:15 2003  Owen Taylor  <otaylor@redhat.com>

        * 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)
This commit is contained in:
Owen Taylor 2003-11-01 15:02:17 +00:00 committed by Owen Taylor
parent 558171a7a3
commit ba0ccd5cfc
9 changed files with 34 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/ftxgdef.c
View File

@ -15,16 +15,16 @@
* *
******************************************************************/ ******************************************************************/
#include <freetype/tttags.h> #include "ftxopen.h"
#include "ftxopenf.h"
#include <freetype/internal/ftstream.h>
#include <freetype/internal/ftmemory.h>
#include <freetype/internal/tttypes.h>
#include "fterrcompat.h" #include "fterrcompat.h"
#include "ftxopen.h" #include FT_TRUETYPE_TAGS_H
#include "ftxopenf.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' ) #define TTAG_GDEF FT_MAKE_TAG( 'G', 'D', 'E', 'F' )

19
src/ftxgpos.c
View File

@ -21,19 +21,18 @@
sharing as much as possible with extensive use of macros. This sharing as much as possible with extensive use of macros. This
is something for a volunteer :-) */ is something for a volunteer :-) */
#define TTAG_GPOS FT_MAKE_TAG( 'G', 'P', 'O', 'S' )
#include <freetype/tttags.h>
#include <freetype/internal/ftstream.h>
#include <freetype/internal/ftmemory.h>
#include <freetype/internal/tttypes.h>
#include "fterrcompat.h"
#include "ftxopen.h" #include "ftxopen.h"
#include "ftxopenf.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_ struct GPOS_Instance_
{ {

15
src/ftxgsub.c
View File

@ -23,17 +23,16 @@
#define EXPORT_FUNC #define EXPORT_FUNC
#include <freetype/tttags.h>
#include <freetype/internal/ftstream.h>
#include <freetype/internal/ftmemory.h>
#include <freetype/internal/tttypes.h>
#include "fterrcompat.h"
#include "ftxopen.h" #include "ftxopen.h"
#include "ftxopenf.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' ) #define GSUB_ID Build_Extension_ID( 'G', 'S', 'U', 'B' )

10
src/ftxopen.c
View File

@ -15,14 +15,14 @@
* *
******************************************************************/ ******************************************************************/
#include <freetype/internal/ftstream.h> #include "ftxopen.h"
#include <freetype/internal/ftmemory.h> #include "ftxopenf.h"
#include <freetype/internal/tttypes.h>
#include "fterrcompat.h" #include "fterrcompat.h"
#include "ftxopen.h" #include FT_INTERNAL_STREAM_H
#include "ftxopenf.h" #include FT_INTERNAL_MEMORY_H
#include FT_INTERNAL_TRUETYPE_TYPES_H
/*************************** /***************************

3
src/ftxopen.h
View File

@ -22,7 +22,8 @@
#ifndef FTXOPEN_H #ifndef FTXOPEN_H
#define FTXOPEN_H #define FTXOPEN_H
#include <freetype/freetype.h> #include <ft2build.h>
#include FT_FREETYPE_H
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

1
src/ottest.c
View File

@ -23,7 +23,6 @@
#include <stdlib.h> #include <stdlib.h>
#include "ftxopen.h" #include "ftxopen.h"
#include <freetype/internal/ftmemory.h>
#include "disasm.h" #include "disasm.h"

4
src/pango-ot-info.c
View File

@ -21,8 +21,8 @@
#include "pango-ot-private.h" #include "pango-ot-private.h"
#include "fterrcompat.h" #include "fterrcompat.h"
#include <freetype/internal/ftobjs.h> #include FT_INTERNAL_OBJECTS_H
#include <freetype/ftmodule.h> #include FT_MODULE_H
static void pango_ot_info_class_init (GObjectClass *object_class); static void pango_ot_info_class_init (GObjectClass *object_class);
static void pango_ot_info_finalize (GObject *object); static void pango_ot_info_finalize (GObject *object);

2
src/pango-ot-private.h
View File

@ -22,8 +22,6 @@
#ifndef __PANGO_OT_PRIVATE_H__ #ifndef __PANGO_OT_PRIVATE_H__
#define __PANGO_OT_PRIVATE_H__ #define __PANGO_OT_PRIVATE_H__
#include <freetype/freetype.h>
#include <glib-object.h> #include <glib-object.h>
#include <pango/pango-ot.h> #include <pango/pango-ot.h>

4
src/pango-ot-ruleset.c
View File

@ -19,11 +19,11 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#include <freetype/internal/ftmemory.h>
#include <pango/pango-ot.h> #include <pango/pango-ot.h>
#include "pango-ot-private.h" #include "pango-ot-private.h"
#include FT_INTERNAL_MEMORY_H /* For FT_Free() */
#define PANGO_SCALE_26_6 (PANGO_SCALE / (1<<6)) #define PANGO_SCALE_26_6 (PANGO_SCALE / (1<<6))
#define PANGO_UNITS_26_6(d) (PANGO_SCALE_26_6 * (d)) #define PANGO_UNITS_26_6(d) (PANGO_SCALE_26_6 * (d))