summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:42:55 +0000
committerEamon Walsh <ewalsh@epoch.ncsc.mil>2004-05-04 19:42:55 +0000
commit908016ef65737b74e5ef497e90d00a791c93977d (patch)
tree199c78a48a15a31c4f08711f82771f67888f0749
parentfb768609ea31ca228c1d97a997bbcb62a496984b (diff)
Merge the new release from HEAD
-rw-r--r--src/FreeType/ftfuncs.c18
-rw-r--r--src/Type1/scanfont.c2
-rw-r--r--src/bitmap/pcfread.c1
-rw-r--r--src/fc/fserve.c2
-rw-r--r--src/fontfile/fontdir.c2
-rw-r--r--src/fontfile/fontfile.c2
-rw-r--r--src/util/fontxlfd.c2
-rw-r--r--src/util/utilbitmap.c5
8 files changed, 24 insertions, 10 deletions
diff --git a/src/FreeType/ftfuncs.c b/src/FreeType/ftfuncs.c
index 81682e4..75d4112 100644
--- a/src/FreeType/ftfuncs.c
+++ b/src/FreeType/ftfuncs.c
@@ -25,6 +25,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
+/* $XdotOrg: xc/lib/font/FreeType/ftfuncs.c,v 1.2 2004/04/23 18:44:07 eich Exp $ */
/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.43 2004/02/07 04:37:18 dawes Exp $ */
@@ -51,7 +52,10 @@ THE SOFTWARE.
#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.
@@ -118,7 +122,7 @@ static char *xlfd_props[] = {
static int ftypeInitP = 0; /* is the engine initialised? */
-static FT_Library ftypeLibrary;
+FT_Library ftypeLibrary;
static FTFacePtr faceTable[NUMFACEBUCKETS];
@@ -906,9 +910,15 @@ FreeTypeRasteriseGlyph(unsigned idx, int flags, CharInfoPtr tgp,
/* 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;
}
}
}
diff --git a/src/Type1/scanfont.c b/src/Type1/scanfont.c
index 64f7473..1ccef28 100644
--- a/src/Type1/scanfont.c
+++ b/src/Type1/scanfont.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: scanfont.c,v 1.3 2000/08/17 19:46:32 cpqbld Exp $ */
+/* $XdotOrg: xc/lib/font/Type1/scanfont.c,v 1.2 2004/04/23 18:44:09 eich Exp $ */
/* $Xorg: scanfont.c,v 1.3 2000/08/17 19:46:32 cpqbld Exp $ */
/* Copyright International Business Machines,Corp. 1991
* All Rights Reserved
diff --git a/src/bitmap/pcfread.c b/src/bitmap/pcfread.c
index ed496be..0b4b6c7 100644
--- a/src/bitmap/pcfread.c
+++ b/src/bitmap/pcfread.c
@@ -908,7 +908,6 @@ pmfReadFont(FontPtr pFont, FontFilePtr file,
if (IS_EOF(file)) goto Bail;
if (encodingOffset == 0xFFFF) {
pFont->info.allExist = FALSE;
- encoding[i] = 0;
} else {
if(!encoding[SEGMENT_MAJOR(i)]) {
encoding[SEGMENT_MAJOR(i)]=
diff --git a/src/fc/fserve.c b/src/fc/fserve.c
index 85a4214..018c22c 100644
--- a/src/fc/fserve.c
+++ b/src/fc/fserve.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/font/fc/fserve.c,v 1.1.4.3 2003/12/06 13:24:22 kaleb Exp $ */
+/* $XdotOrg: xc/lib/font/fc/fserve.c,v 1.2 2004/04/23 18:44:21 eich Exp $ */
/* $Xorg: fserve.c,v 1.4 2001/02/09 02:04:02 xorgcvs Exp $ */
/*
diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
index 024ec03..e6bf4fe 100644
--- a/src/fontfile/fontdir.c
+++ b/src/fontfile/fontdir.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: fontdir.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
+/* $XdotOrg: xc/lib/font/fontfile/fontdir.c,v 1.2 2004/04/23 18:44:21 eich Exp $ */
/* $Xorg: fontdir.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
/*
diff --git a/src/fontfile/fontfile.c b/src/fontfile/fontfile.c
index d32c4a1..77717ff 100644
--- a/src/fontfile/fontfile.c
+++ b/src/fontfile/fontfile.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/lib/font/fontfile/fontfile.c,v 1.1.4.3 2003/12/06 13:24:23 kaleb Exp $ */
+/* $XdotOrg: xc/lib/font/fontfile/fontfile.c,v 1.2 2004/04/23 18:44:21 eich Exp $ */
/* $Xorg: fontfile.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
/*
diff --git a/src/util/fontxlfd.c b/src/util/fontxlfd.c
index 257d558..ac7c8ca 100644
--- a/src/util/fontxlfd.c
+++ b/src/util/fontxlfd.c
@@ -197,7 +197,7 @@ xlfd_round_double(double x)
defined(ia64) || defined(__ia64__) || \
defined(__alpha__) || defined(__alpha) || \
defined(__hppa__) || \
- defined(__AMD64__) || defined(__AMD64) || \
+ defined(__amd64__) || defined(__amd64) || \
defined(sgi)
#if !defined(__UNIXOS2__)
#include <float.h>
diff --git a/src/util/utilbitmap.c b/src/util/utilbitmap.c
index bd7c2cd..d832268 100644
--- a/src/util/utilbitmap.c
+++ b/src/util/utilbitmap.c
@@ -27,6 +27,8 @@ in this Software without prior written authorization from The Open Group.
*/
/* $XFree86: xc/lib/font/util/utilbitmap.c,v 1.4 2001/01/17 19:43:34 dawes Exp $ */
+#ifndef USE_INTERNAL_FREETYPE
+
/*
* Author: Keith Packard, MIT X Consortium
*/
@@ -181,3 +183,6 @@ RepadBitmap (char *pSrc, char *pDst,
}
return dstWidthBytes * height;
}
+
+#endif /* !USE_INTERNAL_FREETYPE */
+