[xorg-commit-diffs] xc/extras/freetype2/include/freetype/config
ftconfig.h, 1.1.4.2, 1.1.4.3 ftheader.h, 1.1.4.1,
1.1.4.2 ftoption.h, 1.1.4.1, 1.1.4.2 ftstdlib.h, 1.1, 1.1.4.1
Egbert Eich
xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:14:31 PDT 2004
- Previous message: [xorg-commit-diffs] xc/extras/freetype2/include/freetype/cache
ftccmap.h, 1.1.4.1, 1.1.4.2 ftcglyph.h, 1.1,
1.1.4.1 ftcimage.h, 1.1.4.1, 1.1.4.2 ftlru.h, 1.1, 1.1.4.1
- Next message: [xorg-commit-diffs] xc/extras/freetype2/include/freetype/internal
ftserv.h, NONE, 1.1.6.1 ftdriver.h, 1.1.4.1,
1.1.4.2 ftgloadr.h, 1.1, 1.1.4.1 ftmemory.h, 1.1,
1.1.4.1 ftobjs.h, 1.1.4.1, 1.1.4.2 internal.h, 1.1.4.2,
1.1.4.3 pcftypes.h, 1.1.4.1, 1.1.4.2 psaux.h, 1.1.4.1,
1.1.4.2 pshints.h, 1.1.4.1, 1.1.4.2 sfnt.h, 1.1.4.1,
1.1.4.2 t1types.h, 1.1, 1.1.4.1 tttypes.h, 1.1.4.1,
1.1.4.2 bdftypes.h, 1.1.4.1, NONE cfftypes.h, 1.1.4.1,
NONE fnttypes.h, 1.1.4.1, NONE ftcore.h, 1.1, NONE ftexcept.h,
1.1.4.2, NONE fthash.h, 1.1.4.1, NONE ftobject.h, 1.1.4.1,
NONE pfr.h, 1.1, NONE psnames.h, 1.1.4.1, NONE t42types.h,
1.1.4.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: eich
Update of /cvs/xorg/xc/extras/freetype2/include/freetype/config
In directory pdx:/home/eich/tstbuild/xc/extras/freetype2/include/freetype/config
Modified Files:
Tag: XORG-CURRENT
ftconfig.h ftheader.h ftoption.h ftstdlib.h
Log Message:
2004-04-15 Egbert Eich <eich at freedesktop.org>
Merged changes from RELEASE-1 branch
Index: ftconfig.h
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/include/freetype/config/ftconfig.h,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/ftconfig.h 5 Mar 2004 13:38:42 -0000 1.1.4.2
+++ b/ftconfig.h 15 Apr 2004 10:14:27 -0000 1.1.4.3
@@ -4,7 +4,7 @@
/* */
/* ANSI-specific configuration file (specification only). */
/* */
-/* Copyright 1996-2001, 2002 by */
+/* Copyright 1996-2001, 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -14,7 +14,6 @@
/* understand and accept it fully. */
/* */
/***************************************************************************/
-/* $XFree86$ */
/*************************************************************************/
/* */
@@ -108,8 +107,8 @@
/* This is the only necessary change, so it is defined here instead */
/* providing a new configuration file. */
/* */
-#if ( defined( __APPLE__ ) && !defined ( DARWIN_NO_CARBON ) ) || \
- ( defined( __MWERKS__ ) && defined( macintosh ) )
+#if ( defined( __APPLE__ ) && !defined( DARWIN_NO_CARBON ) ) || \
+ ( defined( __MWERKS__ ) && defined( macintosh ) )
#define FT_MACINTOSH 1
#endif
@@ -137,7 +136,7 @@
#error "no 32bit type found -- please check your configuration files"
#endif
- /* now, lookup for an integer type that is at least 32 bits */
+ /* look up an integer type that is at least 32 bits */
#if FT_SIZEOF_INT >= 4
typedef int FT_Fast;
@@ -178,10 +177,10 @@
/* Watcom doesn't provide 64-bit data types */
-#elif defined( __MWKS__ ) /* Metrowerks CodeWarrior */
+#elif defined( __MWERKS__ ) /* Metrowerks CodeWarrior */
- /* I don't know if it provides 64-bit data types, any suggestion */
- /* is welcome. */
+#define FT_LONG64
+#define FT_INT64 long long int
#elif defined( __GNUC__ )
@@ -192,6 +191,11 @@
#endif /* FT_SIZEOF_LONG == 8 */
+#define FT_BEGIN_STMNT do {
+#define FT_END_STMNT } while ( 0 )
+#define FT_DUMMY_STMNT FT_BEGIN_STMNT FT_END_STMNT
+
+
/*************************************************************************/
/* */
/* A 64-bit data type will create compilation problems if you compile */
Index: ftheader.h
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/include/freetype/config/ftheader.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/ftheader.h 26 Nov 2003 22:48:24 -0000 1.1.4.1
+++ b/ftheader.h 15 Apr 2004 10:14:27 -0000 1.1.4.2
@@ -281,7 +281,7 @@
/* A macro used in #include statements to name the file containing */
/* the module management API of FreeType 2. */
/* */
-#define FT_MODULE_H <freetype/ftmodule.h>
+#define FT_MODULE_H <freetype/ftmodapi.h>
/*************************************************************************/
@@ -509,7 +509,7 @@
/* */
#define FT_TRIGONOMETRY_H <freetype/fttrigon.h>
-#define FT_STROKER_H <freetype/ftstroker.h>
+#define FT_STROKER_H <freetype/ftstroke.h>
#define FT_SYNTHESIS_H <freetype/ftsynth.h>
#define FT_ERROR_DEFINITIONS_H <freetype/fterrdef.h>
@@ -523,6 +523,8 @@
#define FT_INCREMENTAL_H <freetype/ftincrem.h>
+#define FT_TRUETYPE_UNPATENTED_H <freetype/ttunpat.h>
+
/* now include internal headers definitions from <freetype/internal/...> */
#define FT_INTERNAL_INTERNAL_H <freetype/internal/internal.h>
Index: ftoption.h
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/include/freetype/config/ftoption.h,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/ftoption.h 26 Nov 2003 22:48:25 -0000 1.1.4.1
+++ b/ftoption.h 15 Apr 2004 10:14:27 -0000 1.1.4.2
@@ -4,7 +4,7 @@
/* */
/* User-selectable configuration macros (specification only). */
/* */
-/* Copyright 1996-2001, 2002 by */
+/* Copyright 1996-2001, 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -81,16 +81,16 @@
/* by FreeType to speed up some computations. However, this will create */
/* some problems when compiling the library in strict ANSI mode. */
/* */
- /* For this reason, the use of 64-bit ints is normally disabled when */
+ /* For this reason, the use of 64-bit integers is normally disabled when */
/* the __STDC__ macro is defined. You can however disable this by */
- /* defining here the macro FT_CONFIG_OPTION_FORCE_INT64. */
+ /* defining the macro FT_CONFIG_OPTION_FORCE_INT64 here. */
/* */
- /* For most compilers, this will only create compilation warnings */
- /* when building the library. */
+ /* For most compilers, this will only create compilation warnings when */
+ /* building the library. */
/* */
/* ObNote: The compiler-specific 64-bit integers are detected in the */
- /* file "ftconfig.h" either statically, or through Autoconf */
- /* on platforms that support it. */
+ /* file "ftconfig.h" either statically or through the */
+ /* `configure' script on supported platforms. */
/* */
#undef FT_CONFIG_OPTION_FORCE_INT64
@@ -100,11 +100,11 @@
/* Gzip-compressed file support. */
/* */
/* FreeType now handles font files that have been compressed with the */
- /* 'gzip' program. This is mostly used to parse many of the PCF files */
- /* that come with XFree86. The implementation uses 'zlib' to */
+ /* 'gzip' program. This is mostly used to parse many of the PCF files */
+ /* that come with XFree86. The implementation uses `zlib' to */
/* partially uncompress the file on the fly (see src/base/ftgzip.c). */
/* */
- /* Define this macro if you want to enable this "feature". Note that */
+ /* Define this macro if you want to enable this "feature". Note that */
/* this will however force you to link the zlib to any program that */
/* also uses FreeType. */
/* */
@@ -117,17 +117,17 @@
/* */
/* This macro is only used when FT_CONFIG_OPTION_USE_ZLIB is defined. */
/* It allows FreeType's "ftgzip" component to link to the system's */
- /* installation of the ZLib library. This is useful on systems like */
+ /* installation of the ZLib library. This is useful on systems like */
/* Unix or VMS where it generally is already available. */
/* */
/* If you let it undefined, the component will use its own copy */
- /* of the zlib sources instead. These have been modified to be */
+ /* of the zlib sources instead. These have been modified to be */
/* included directly within the component and *not* export external */
- /* function names. This allows you to link any program with FreeType */
+ /* function names. This allows you to link any program with FreeType */
/* _and_ ZLib without linking conflicts. */
/* */
- /* do not #undef this macro here, since the build system might */
- /* define for certain configurations */
+ /* Do not #undef this macro here since the build system might define */
+ /* it for certain configurations only. */
/* */
/* #define FT_CONFIG_OPTION_SYSTEM_ZLIB */
@@ -167,6 +167,9 @@
/* will be later automatically defined as `extern return_type' to */
/* allow normal compilation. */
/* */
+ /* Do not #undef these macros here since the build system might define */
+ /* them for certain configurations only. */
+ /* */
/* #define FT_EXPORT(x) extern x */
/* #define FT_EXPORT_DEF(x) x */
@@ -216,12 +219,25 @@
/*************************************************************************/
/* */
+ /* Support for Mac fonts */
+ /* */
+ /* Define this macro if you want support for outline fonts in Mac */
+ /* format (mac dfont, mac resource, macbinary containing a mac */
+ /* resource) on non-Mac platforms. */
+ /* */
+ /* Note that the `FOND' resource isn't checked. */
+ /* */
+#define FT_CONFIG_OPTION_MAC_FONTS
+
+
+ /*************************************************************************/
+ /* */
/* Allow the use of FT_Incremental_Interface to load typefaces that */
/* contain no glyph data, but supply it via a callback function. */
/* This allows FreeType to be used with the PostScript language, using */
/* the GhostScript interpreter. */
/* */
-/* #define FT_CONFIG_OPTION_INCREMENTAL */
+/* #define FT_CONFIG_OPTION_INCREMENTAL */
/*************************************************************************/
@@ -229,7 +245,7 @@
/* The size in bytes of the render pool used by the scan-line converter */
/* to do all of its work. */
/* */
- /* This must be greater than 4kByte. */
+ /* This must be greater than 4KByte. */
/* */
#define FT_RENDER_POOL_SIZE 16384L
@@ -258,8 +274,11 @@
/* */
/* Don't define any of these macros to compile in `release' mode! */
/* */
-/* #define FT_DEBUG_LEVEL_ERROR */
-/* #define FT_DEBUG_LEVEL_TRACE */
+ /* Do not #undef these macros here since the build system might define */
+ /* them for certain configurations only. */
+ /* */
+/* #define FT_DEBUG_LEVEL_ERROR */
+/* #define FT_DEBUG_LEVEL_TRACE */
/*************************************************************************/
@@ -272,10 +291,12 @@
/* should define FT_DEBUG_MEMORY here. */
/* */
/* Note that the memory debugger is only activated at runtime when */
- /* when the _environment_ variable "FT_DEBUG_MEMORY" is also defined! */
+ /* when the _environment_ variable "FT2_DEBUG_MEMORY" is defined also! */
/* */
-/* #define FT_DEBUG_MEMORY */
-
+ /* Do not #undef this macro here since the build system might define */
+ /* it for certain configurations only. */
+ /* */
+/* #define FT_DEBUG_MEMORY */
/*************************************************************************/
@@ -375,14 +396,26 @@
/* By undefining this, you will only compile the code necessary to load */
/* TrueType glyphs without hinting. */
/* */
- /* do not #undef this macro here, since the build system might */
- /* define for certain configurations */
+ /* Do not #undef this macro here, since the build system might */
+ /* define it for certain configurations only. */
/* */
/* #define TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
/*************************************************************************/
/* */
+ /* Define TT_CONFIG_OPTION_UNPATENTED_HINTING (in addition to */
+ /* TT_CONFIG_OPTION_BYTECODE_INTERPRETER) to compile the unpatented */
+ /* work-around hinting system. Note that for the moment, the algorithm */
+ /* is only used when selected at runtime through the parameter tag */
+ /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook */
+ /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally actived */
+ /* */
+#define TT_CONFIG_OPTION_UNPATENTED_HINTING
+
+
+ /*************************************************************************/
+ /* */
/* Define TT_CONFIG_OPTION_INTERPRETER_SWITCH to compile the TrueType */
/* bytecode interpreter with a huge switch statement, rather than a call */
/* table. This results in smaller and faster code for a number of */
@@ -470,21 +503,21 @@
/* */
/*
- * the FT_CONFIG_OPTION_CHESTER_XXXX macros are used to toggle some recent
- * improvements to the auto-hinter contributed by David Chester. They will
- * most likely disappear completely in the next release. For now, you should
- * always keep them defined
+ * The FT_CONFIG_OPTION_CHESTER_XXXX macros are used to toggle some recent
+ * improvements to the auto-hinter contributed by David Chester. They will
+ * most likely disappear completely in the next release. For now, you
+ * should always keep them defined.
*
*/
#define FT_CONFIG_OPTION_CHESTER_HINTS
#ifdef FT_CONFIG_OPTION_CHESTER_HINTS
-# define FT_CONFIG_CHESTER_SMALL_F
-# define FT_CONFIG_CHESTER_ASCENDER
-# define FT_CONFIG_CHESTER_SERIF
-# define FT_CONFIG_CHESTER_STEM
-# define FT_CONFIG_CHESTER_BLUE_SCALE
+#define FT_CONFIG_CHESTER_SMALL_F
+#define FT_CONFIG_CHESTER_ASCENDER
+#define FT_CONFIG_CHESTER_SERIF
+#define FT_CONFIG_CHESTER_STEM
+#define FT_CONFIG_CHESTER_BLUE_SCALE
#endif /* FT_CONFIG_OPTION_CHESTER_HINTS */
Index: ftstdlib.h
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/include/freetype/config/ftstdlib.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/ftstdlib.h 14 Nov 2003 16:48:24 -0000 1.1
+++ b/ftstdlib.h 15 Apr 2004 10:14:28 -0000 1.1.4.1
@@ -5,7 +5,7 @@
/* ANSI-specific library and header configuration file (specification */
/* only). */
/* */
-/* Copyright 2002 by */
+/* Copyright 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -73,15 +73,17 @@
#include <ctype.h>
-#define ft_isalnum isalnum
-#define ft_isupper isupper
-#define ft_islower islower
-#define ft_xdigit isxdigit
+#define ft_isalnum isalnum
+#define ft_isupper isupper
+#define ft_islower islower
+#define ft_isdigit isdigit
+#define ft_isxdigit isxdigit
#include <string.h>
#define ft_strlen strlen
+#define ft_strcat strcat
#define ft_strcmp strcmp
#define ft_strncmp strncmp
#define ft_memcpy memcpy
- Previous message: [xorg-commit-diffs] xc/extras/freetype2/include/freetype/cache
ftccmap.h, 1.1.4.1, 1.1.4.2 ftcglyph.h, 1.1,
1.1.4.1 ftcimage.h, 1.1.4.1, 1.1.4.2 ftlru.h, 1.1, 1.1.4.1
- Next message: [xorg-commit-diffs] xc/extras/freetype2/include/freetype/internal
ftserv.h, NONE, 1.1.6.1 ftdriver.h, 1.1.4.1,
1.1.4.2 ftgloadr.h, 1.1, 1.1.4.1 ftmemory.h, 1.1,
1.1.4.1 ftobjs.h, 1.1.4.1, 1.1.4.2 internal.h, 1.1.4.2,
1.1.4.3 pcftypes.h, 1.1.4.1, 1.1.4.2 psaux.h, 1.1.4.1,
1.1.4.2 pshints.h, 1.1.4.1, 1.1.4.2 sfnt.h, 1.1.4.1,
1.1.4.2 t1types.h, 1.1, 1.1.4.1 tttypes.h, 1.1.4.1,
1.1.4.2 bdftypes.h, 1.1.4.1, NONE cfftypes.h, 1.1.4.1,
NONE fnttypes.h, 1.1.4.1, NONE ftcore.h, 1.1, NONE ftexcept.h,
1.1.4.2, NONE fthash.h, 1.1.4.1, NONE ftobject.h, 1.1.4.1,
NONE pfr.h, 1.1, NONE psnames.h, 1.1.4.1, NONE t42types.h,
1.1.4.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit-diffs
mailing list