From 96e551cc3edc7d47f3c25cf12992a1b6309003ab Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 23 Apr 2002 20:21:21 +0000 Subject: Add compatibility defines for changes in FreeType 2.1.0. Tue Apr 23 16:15:07 2002 Owen Taylor * pango/opentype/fterrcompat.h: Add compatibility defines for changes in FreeType 2.1.0. --- ChangeLog | 5 +++++ ChangeLog.pre-1-10 | 5 +++++ ChangeLog.pre-1-2 | 5 +++++ ChangeLog.pre-1-4 | 5 +++++ ChangeLog.pre-1-6 | 5 +++++ ChangeLog.pre-1-8 | 5 +++++ pango/opentype/fterrcompat.h | 39 +++++++++++++++++++++++++++++++++++++-- 7 files changed, 67 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 81dfac7b..41bbfa93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Apr 23 16:15:07 2002 Owen Taylor + + * pango/opentype/fterrcompat.h: Add compatibility + defines for changes in FreeType 2.1.0. + Tue Apr 23 15:20:33 2002 Owen Taylor * README: Fix typo. (#79574) diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 81dfac7b..41bbfa93 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -1,3 +1,8 @@ +Tue Apr 23 16:15:07 2002 Owen Taylor + + * pango/opentype/fterrcompat.h: Add compatibility + defines for changes in FreeType 2.1.0. + Tue Apr 23 15:20:33 2002 Owen Taylor * README: Fix typo. (#79574) diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 81dfac7b..41bbfa93 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -1,3 +1,8 @@ +Tue Apr 23 16:15:07 2002 Owen Taylor + + * pango/opentype/fterrcompat.h: Add compatibility + defines for changes in FreeType 2.1.0. + Tue Apr 23 15:20:33 2002 Owen Taylor * README: Fix typo. (#79574) diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 81dfac7b..41bbfa93 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -1,3 +1,8 @@ +Tue Apr 23 16:15:07 2002 Owen Taylor + + * pango/opentype/fterrcompat.h: Add compatibility + defines for changes in FreeType 2.1.0. + Tue Apr 23 15:20:33 2002 Owen Taylor * README: Fix typo. (#79574) diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 81dfac7b..41bbfa93 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -1,3 +1,8 @@ +Tue Apr 23 16:15:07 2002 Owen Taylor + + * pango/opentype/fterrcompat.h: Add compatibility + defines for changes in FreeType 2.1.0. + Tue Apr 23 15:20:33 2002 Owen Taylor * README: Fix typo. (#79574) diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 81dfac7b..41bbfa93 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -1,3 +1,8 @@ +Tue Apr 23 16:15:07 2002 Owen Taylor + + * pango/opentype/fterrcompat.h: Add compatibility + defines for changes in FreeType 2.1.0. + Tue Apr 23 15:20:33 2002 Owen Taylor * README: Fix typo. (#79574) diff --git a/pango/opentype/fterrcompat.h b/pango/opentype/fterrcompat.h index 70b45e22..200cf642 100644 --- a/pango/opentype/fterrcompat.h +++ b/pango/opentype/fterrcompat.h @@ -11,6 +11,41 @@ #define TT_Err_Invalid_Argument FT_Err_Invalid_Argument #define TT_Err_Invalid_Face_Handle FT_Err_Invalid_Face_Handle #define TT_Err_Table_Missing FT_Err_Table_Missing -#endif +#endif /* HAVE_FREETYPE_2_0_3 */ -#endif +/* Compat macros for name changes in FreeType 2.1.0 + */ +#if (FREETYPE_MAJOR == 2) && (FREETYPE_MINOR >= 1) + +#define FILE_Pos() FT_STREAM_POS() +#define FILE_Seek( position ) FT_STREAM_SEEK( position) + +#define ACCESS_Frame( size ) FT_FRAME_ENTER( size ) +#define FORGET_Frame() FT_FRAME_EXIT() + +#define GET_Char() FT_GET_CHAR() +#define GET_Byte() FT_GET_BYTE() +#define GET_Short() FT_GET_SHORT() +#define GET_UShort() FT_GET_USHORT() +#define GET_Offset() FT_GET_OFF3() +#define GET_UOffset() FT_GET_UOFF3() +#define GET_Long() FT_GET_LONG() +#define GET_ULong() FT_GET_ULONG() +#define GET_Tag4() FT_GET_TAG4() + +#define ALLOC_ARRAY( _pointer_, _count_, _type_ ) \ + FT_SET_ERROR (FT_MEM_ALLOC_ARRAY( _pointer_, _count_, _type_)) + +/* FT_MEM_REALLOC macro broken in 2.1.0 */ +#define REALLOC_ARRAY( _pointer_, _old_, _new_, _type_ ) \ + FT_SET_ERROR ( FT_MEM_REALLOC( _pointer_, (_old_) * sizeof ( _type_ ), \ + (_new_) * sizeof ( _type_ ) ) ) + +#define ALLOC( _pointer_, _size_ ) FT_ALLOC( _pointer_, _size_ ) +#define FREE( _pointer_ ) FT_FREE( _pointer_ ) + +#define MEM_Copy( dest, source, count ) FT_MEM_COPY( dest, source, count ) + +#endif /* >= 2.1.0 */ + +#endif /* FTERRCOMPAT_H */ -- cgit v1.2.1