[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
Egbert Eich
xorg-commit at pdx.freedesktop.org
Thu Apr 15 03:14:30 PDT 2004
- Previous message: [xorg-commit-diffs]
xc/extras/freetype2/include/freetype ftmodapi.h, NONE,
1.1.6.1 ftstroke.h, NONE, 1.1.6.1 ttunpat.h, NONE,
1.1.6.1 freetype.h, 1.1.4.1, 1.1.4.2 ftbbox.h, 1.1,
1.1.4.1 ftbdf.h, 1.1.4.1, 1.1.4.2 ftcache.h, 1.1.4.1,
1.1.4.2 ftglyph.h, 1.1.4.1, 1.1.4.2 ftgzip.h, 1.1,
1.1.4.1 ftimage.h, 1.1.4.1, 1.1.4.2 ftincrem.h, 1.1,
1.1.4.1 ftlist.h, 1.1, 1.1.4.1 ftmm.h, 1.1, 1.1.4.1 ftmoderr.h,
1.1, 1.1.4.1 ftoutln.h, 1.1.4.1, 1.1.4.2 ftpfr.h, 1.1,
1.1.4.1 ftsizes.h, 1.1.4.1, 1.1.4.2 ftsnames.h, 1.1,
1.1.4.1 ftsynth.h, 1.1.4.1, 1.1.4.2 fttrigon.h, 1.1.4.1,
1.1.4.2 ftwinfnt.h, 1.1, 1.1.4.1 ftxf86.h, 1.1,
1.1.4.1 t1tables.h, 1.1.4.1, 1.1.4.2 ttnameid.h, 1.1.4.1,
1.1.4.2 tttables.h, 1.1.4.1, 1.1.4.2 tttags.h, 1.1,
1.1.4.1 ftmodule.h, 1.1.4.1, NONE ftstroker.h, 1.1, NONE
- Next message: [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: eich
Update of /cvs/xorg/xc/extras/freetype2/include/freetype/cache
In directory pdx:/home/eich/tstbuild/xc/extras/freetype2/include/freetype/cache
Modified Files:
Tag: XORG-CURRENT
ftccmap.h ftcglyph.h ftcimage.h ftlru.h
Log Message:
2004-04-15 Egbert Eich <eich at freedesktop.org>
Merged changes from RELEASE-1 branch
Index: ftccmap.h
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/include/freetype/cache/ftccmap.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/ftccmap.h 26 Nov 2003 22:48:24 -0000 1.1.4.1
+++ b/ftccmap.h 15 Apr 2004 10:14:27 -0000 1.1.4.2
@@ -4,7 +4,7 @@
/* */
/* FreeType charmap cache (specification). */
/* */
-/* Copyright 2000-2001 by */
+/* Copyright 2000-2001, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -36,7 +36,7 @@
/*************************************************************************/
/* */
/* @type: */
- /* FTC_CmapCache */
+ /* FTC_CMapCache */
/* */
/* @description: */
/* An opaque handle used to manager a charmap cache. This cache is */
@@ -54,8 +54,8 @@
/* A handle to an @FTC_CMapDescRec structure used to describe a given */
/* charmap in a charmap cache. */
/* */
- /* Each @FTC_CMapDesc describes which charmap (of which @FTC_Face) we */
- /* want to use in @FTC_CMapCache_Lookup. */
+ /* Each @FTC_CMapDesc describes which charmap (of which @FTC_FaceID) */
+ /* we want to use in @FTC_CMapCache_Lookup. */
/* */
typedef struct FTC_CMapDescRec_* FTC_CMapDesc;
@@ -66,8 +66,8 @@
/* FTC_CMapType */
/* */
/* @description: */
- /* The list of valid @FTC_CMap types. They indicate how we want to */
- /* address a charmap within an @FTC_FaceID. */
+ /* The list of valid @FTC_CMapDesc types. They indicate how we want */
+ /* to address a charmap within an @FTC_FaceID. */
/* */
/* @values: */
/* FTC_CMAP_BY_INDEX :: */
Index: ftcglyph.h
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/include/freetype/cache/ftcglyph.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/ftcglyph.h 14 Nov 2003 16:48:24 -0000 1.1
+++ b/ftcglyph.h 15 Apr 2004 10:14:27 -0000 1.1.4.1
@@ -4,7 +4,7 @@
/* */
/* FreeType abstract glyph cache (specification). */
/* */
-/* Copyright 2000-2001 by */
+/* Copyright 2000-2001, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -50,8 +50,6 @@
#include FT_CACHE_H
#include FT_CACHE_MANAGER_H
-#include <stddef.h>
-
FT_BEGIN_HEADER
@@ -120,10 +118,10 @@
FTC_GLYPH_FAMILY( gfam )->item_count )
/* compute a glyph request's hash value */
-#define FTC_GLYPH_FAMILY_HASH( gfam, gindex ) \
- ( (FT_UFast)( \
- ( FTC_GLYPH_FAMILY( gfam )->hash << 16 ) | \
- ( FTC_GLYPH_FAMILY_CHUNK( gfam, gindex ) & 0xFFFF ) ) )
+#define FTC_GLYPH_FAMILY_HASH( gfam, gindex ) \
+ ( (FT_UFast)( \
+ ( FTC_GLYPH_FAMILY( gfam )->hash << 16 ) | \
+ ( FTC_GLYPH_FAMILY_CHUNK( gfam, gindex ) & 0xFFFFU ) ) )
/* must be called in an FTC_Family_CompareFunc to update the query */
/* whenever a glyph set is matched in the lookup, or when it */
@@ -138,8 +136,8 @@
} while ( 0 )
/* retrieve glyph index of glyph node */
-#define FTC_GLYPH_NODE_GINDEX( x ) \
- ( (FT_UInt)( FTC_GLYPH_NODE( x )->node.hash & 0xFFFF ) )
+#define FTC_GLYPH_NODE_GINDEX( x ) \
+ ( (FT_UInt)( FTC_GLYPH_NODE( x )->node.hash & 0xFFFFU ) )
/*************************************************************************/
Index: ftcimage.h
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/include/freetype/cache/ftcimage.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/ftcimage.h 26 Nov 2003 22:48:24 -0000 1.1.4.1
+++ b/ftcimage.h 15 Apr 2004 10:14:27 -0000 1.1.4.2
@@ -4,7 +4,7 @@
/* */
/* FreeType Image cache (specification). */
/* */
-/* Copyright 2000-2001, 2002 by */
+/* Copyright 2000-2001, 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -202,18 +202,19 @@
/* scaled outline */
#define ftc_image_outline ftc_image_format_outline
+
/*************************************************************************/
/* */
/* <Struct> */
/* FTC_Image_Desc */
/* */
/* <Description> */
- /* THIS TYPE IS DEPRECATED. Use @FTC_ImageDesc instead. */
+ /* THIS TYPE IS DEPRECATED. Use @FTC_ImageTypeRec instead. */
/* */
/* A simple structure used to describe a given glyph image category. */
/* */
/* <Fields> */
- /* size :: An @FTC_SizeRec used to describe the glyph's face */
+ /* font :: An @FTC_FontRec used to describe the glyph's face */
/* and size. */
/* */
/* image_type :: The glyph image's type. */
Index: ftlru.h
===================================================================
RCS file: /cvs/xorg/xc/extras/freetype2/include/freetype/cache/ftlru.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -d -r1.1 -r1.1.4.1
--- a/ftlru.h 14 Nov 2003 16:48:24 -0000 1.1
+++ b/ftlru.h 15 Apr 2004 10:14:27 -0000 1.1.4.1
@@ -4,7 +4,7 @@
/* */
/* Simple LRU list-cache (specification). */
/* */
-/* Copyright 2000-2001 by */
+/* Copyright 2000-2001, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -62,6 +62,12 @@
#include <ft2build.h>
#include FT_FREETYPE_H
+#ifdef FREETYPE_H
+#error "freetype.h of FreeType 1 has been loaded!"
+#error "Please fix the directory search order for header files"
+#error "so that freetype.h of FreeType 2 is found first."
+#endif
+
FT_BEGIN_HEADER
- Previous message: [xorg-commit-diffs]
xc/extras/freetype2/include/freetype ftmodapi.h, NONE,
1.1.6.1 ftstroke.h, NONE, 1.1.6.1 ttunpat.h, NONE,
1.1.6.1 freetype.h, 1.1.4.1, 1.1.4.2 ftbbox.h, 1.1,
1.1.4.1 ftbdf.h, 1.1.4.1, 1.1.4.2 ftcache.h, 1.1.4.1,
1.1.4.2 ftglyph.h, 1.1.4.1, 1.1.4.2 ftgzip.h, 1.1,
1.1.4.1 ftimage.h, 1.1.4.1, 1.1.4.2 ftincrem.h, 1.1,
1.1.4.1 ftlist.h, 1.1, 1.1.4.1 ftmm.h, 1.1, 1.1.4.1 ftmoderr.h,
1.1, 1.1.4.1 ftoutln.h, 1.1.4.1, 1.1.4.2 ftpfr.h, 1.1,
1.1.4.1 ftsizes.h, 1.1.4.1, 1.1.4.2 ftsnames.h, 1.1,
1.1.4.1 ftsynth.h, 1.1.4.1, 1.1.4.2 fttrigon.h, 1.1.4.1,
1.1.4.2 ftwinfnt.h, 1.1, 1.1.4.1 ftxf86.h, 1.1,
1.1.4.1 t1tables.h, 1.1.4.1, 1.1.4.2 ttnameid.h, 1.1.4.1,
1.1.4.2 tttables.h, 1.1.4.1, 1.1.4.2 tttags.h, 1.1,
1.1.4.1 ftmodule.h, 1.1.4.1, NONE ftstroker.h, 1.1, NONE
- Next message: [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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the xorg-commit-diffs
mailing list