[xorg-commit-diffs] xc/lib/font/FreeType Imakefile, 1.1.4.1.6.2, 1.1.4.1.6.2.6.1 ftfuncs.c, 1.1.4.4.2.2, 1.1.4.4.2.2.6.1

[Roland Mainz]

Committed by: gisburn

Update of /cvs/xorg/xc/lib/font/FreeType
In directory pdx:/tmp/cvs-serv7662/xc/lib/font/FreeType

Modified Files:
      Tag: XPRINT
	Imakefile ftfuncs.c 
Log Message:
Resync to 2004-04-10 XORG-RELEASE-1 branch

Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/lib/font/FreeType/Imakefile,v
retrieving revision 1.1.4.1.6.2
retrieving revision 1.1.4.1.6.2.6.1
diff -u -d -r1.1.4.1.6.2 -r1.1.4.1.6.2.6.1
--- a/Imakefile	4 Mar 2004 17:47:03 -0000	1.1.4.1.6.2
+++ b/Imakefile	10 Apr 2004 09:04:08 -0000	1.1.4.1.6.2.6.1
@@ -8,12 +8,13 @@
 SUBDIRS = module
 #endif
 
-#ifndef HasFreetype2
+#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)

Index: ftfuncs.c
===================================================================
RCS file: /cvs/xorg/xc/lib/font/FreeType/ftfuncs.c,v
retrieving revision 1.1.4.4.2.2
retrieving revision 1.1.4.4.2.2.6.1
diff -u -d -r1.1.4.4.2.2 -r1.1.4.4.2.2.6.1
--- a/ftfuncs.c	4 Mar 2004 17:47:03 -0000	1.1.4.4.2.2
+++ b/ftfuncs.c	10 Apr 2004 09:04:08 -0000	1.1.4.4.2.2.6.1
@@ -52,6 +52,9 @@
 #include FT_XFREE86_H
 #include FT_BBOX_H
 #include FT_INTERNAL_TRUETYPE_TYPES_H
+#ifdef USE_INTERNAL_FREETYPE
+# include "ttobjs.h"
+#endif
 
 /*
  *  If you want to use FT_Outline_Get_CBox instead of 
@@ -907,8 +910,14 @@
 	    /* 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 ) )
+#else
 		if((instance->load_flags & FT_LOAD_NO_BITMAP)
 		   || (face->face->face_flags & FT_FACE_FLAG_FIXED_SIZES) == 0)
+#endif
 		    correct=1;
 	    }
 	}