[xorg-commit-diffs] xc/lib/font/FreeType Imakefile, 1.1.4.2, 1.1.4.3 ftconfig.h, 1.1.4.2, 1.1.4.3 ftfuncs.c, 1.1.4.5, 1.1.4.6

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/lib/font/FreeType
In directory pdx:/home/eich/tstbuild/xc/lib/font/FreeType

Modified Files:
      Tag: XORG-CURRENT
	Imakefile ftconfig.h ftfuncs.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/font/FreeType/Imakefile,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/Imakefile	5 Mar 2004 13:39:31 -0000	1.1.4.2
+++ b/Imakefile	15 Apr 2004 10:15:07 -0000	1.1.4.3
@@ -7,14 +7,19 @@
 SUBDIRS = module
 #endif
 
+#if !HasFreetype2
+EXTRAINCLUDES = -I$(FT2SOURCEDIR)/truetype
+INTERNALDEFINES = -DUSE_INTERNAL_FREETYPE
+#endif
+
 DEFINES = ServerExtraDefines StrcasecmpDefines Freetype2BuildDefines \
-	  -DXFREE86_FT2
+	  -DXFREE86_FT2 $(INTERNALDEFINES)
 
 FT2SOURCEDIR = $(TOP)/extras/freetype2/src
 FT2INCS = $(FREETYPE2INCLUDES)
 
 INCLUDES = $(FT2INCS) -I. -I$(FONTINCSRC) -I../include -I$(XINCLUDESRC) \
-           -I$(SERVERSRC)/include -I$(FT2SOURCEDIR)/truetype \
+           -I$(SERVERSRC)/include $(EXTRAINCLUDES) \
            -I$(INCLUDESRC)
 
 SRCS = xttcap.c ftfuncs.c ftenc.c fttools.c

Index: ftconfig.h
===================================================================
RCS file: /cvs/xorg/xc/lib/font/FreeType/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:39:31 -0000	1.1.4.2
+++ b/ftconfig.h	15 Apr 2004 10:15:07 -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.                      */
 /*                                                                         */
 /*  Modified for XFree86.                                                  */
@@ -16,8 +16,8 @@
 /*  understand and accept it fully.                                        */
 /*                                                                         */
 /***************************************************************************/
+/* $XFree86$ */
 
-/* $XFree86: xc/lib/font/FreeType/ftconfig.h,v 1.6tsi Exp $ */
 
   /*************************************************************************/
   /*                                                                       */
@@ -128,8 +128,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
 
@@ -157,7 +157,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;
@@ -198,10 +198,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__ )
 
@@ -212,6 +212,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: ftfuncs.c
===================================================================
RCS file: /cvs/xorg/xc/lib/font/FreeType/ftfuncs.c,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -d -r1.1.4.5 -r1.1.4.6
--- a/ftfuncs.c	5 Mar 2004 13:39:31 -0000	1.1.4.5
+++ b/ftfuncs.c	15 Apr 2004 10:15:07 -0000	1.1.4.6
@@ -25,6 +25,7 @@
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
+/* $XdotOrg$ */
 
 /* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.43 2004/02/07 04:37:18 dawes Exp $ */
 
@@ -51,7 +52,10 @@
 #include FT_XFREE86_H
 #include FT_BBOX_H
 #include FT_INTERNAL_TRUETYPE_TYPES_H
-#include "ttobjs.h"
+#ifdef USE_INTERNAL_FREETYPE
+# include "ttobjs.h"
+#endif
+
 /*
  *  If you want to use FT_Outline_Get_CBox instead of 
  *  FT_Outline_Get_BBox, define here.
@@ -906,9 +910,15 @@
 	    /* If sbit is available, we don't use very lazy method. */
 	    /* See TT_Load_Glyph */
 	    if( FT_IS_SFNT( face->face ) ) {
+#ifdef USE_INTERNAL_FREETYPE
 		TT_Size tt_size = (TT_Size)instance->size;
-		if( !( !(instance->load_flags & FT_LOAD_NO_BITMAP) 
-		       && tt_size->strike_index != 0xFFFFU ) ) correct=1;
+		if( !( !(instance->load_flags & FT_LOAD_NO_BITMAP)
+		       && tt_size->strike_index != 0xFFFFU ) )
+#else
+		if((instance->load_flags & FT_LOAD_NO_BITMAP)
+		   || (face->face->face_flags & FT_FACE_FLAG_FIXED_SIZES) == 0)
+#endif
+		    correct=1;
 	    }
 	}
     }