diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:33:21 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:33:21 +0000 |
| commit | 0f41eb539e0c30e9b06171a521c0f28ba5410871 (patch) | |
| tree | 20bebcf89bedf66f43b48ca0d58623f0ec328946 | |
| parent | 2010add583954392d26607e421da933600d5abb2 (diff) | |
| download | xorg-lib-libXft-CYGWIN.tar.gz | |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_2-MERGECYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGECYGWIN
| -rw-r--r-- | include/X11/Xft/Xft.h | 1 | ||||
| -rw-r--r-- | include/X11/Xft/XftCompat.h | 1 | ||||
| -rw-r--r-- | src/xftcolor.c | 1 | ||||
| -rw-r--r-- | src/xftcore.c | 1 | ||||
| -rw-r--r-- | src/xftdbg.c | 1 | ||||
| -rw-r--r-- | src/xftdpy.c | 1 | ||||
| -rw-r--r-- | src/xftfreetype.c | 3 | ||||
| -rw-r--r-- | src/xftglyphs.c | 1 | ||||
| -rw-r--r-- | src/xftinit.c | 1 | ||||
| -rw-r--r-- | src/xftint.h | 11 | ||||
| -rw-r--r-- | src/xftlist.c | 1 | ||||
| -rw-r--r-- | src/xftname.c | 1 | ||||
| -rw-r--r-- | src/xftrender.c | 1 | ||||
| -rw-r--r-- | src/xftstr.c | 1 | ||||
| -rw-r--r-- | src/xftswap.c | 1 | ||||
| -rw-r--r-- | src/xftxlfd.c | 1 |
16 files changed, 12 insertions, 16 deletions
diff --git a/include/X11/Xft/Xft.h b/include/X11/Xft/Xft.h index 1c67265..d6199b1 100644 --- a/include/X11/Xft/Xft.h +++ b/include/X11/Xft/Xft.h @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/include/X11/Xft/XftCompat.h b/include/X11/Xft/XftCompat.h index 30e08e7..34a6d08 100644 --- a/include/X11/Xft/XftCompat.h +++ b/include/X11/Xft/XftCompat.h @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2001 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/xftcolor.c b/src/xftcolor.c index 4d17045..7377c78 100644 --- a/src/xftcolor.c +++ b/src/xftcolor.c @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/xftcore.c b/src/xftcore.c index 4c8470a..f43e467 100644 --- a/src/xftcore.c +++ b/src/xftcore.c @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/xftdbg.c b/src/xftdbg.c index 0c6e8c9..c30c6d3 100644 --- a/src/xftdbg.c +++ b/src/xftdbg.c @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/xftdpy.c b/src/xftdpy.c index 86f9c2a..1b38424 100644 --- a/src/xftdpy.c +++ b/src/xftdpy.c @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/xftfreetype.c b/src/xftfreetype.c index 1a52c21..676b7e6 100644 --- a/src/xftfreetype.c +++ b/src/xftfreetype.c @@ -289,7 +289,8 @@ _XftReleaseFile (XftFtFile *f) if (f->face) FT_Done_Face (f->face); } - XftMemFree (XFT_MEM_FILE, sizeof (XftFtFile) + strlen (f->file) + 1); + XftMemFree (XFT_MEM_FILE, + sizeof (XftFtFile) + f->file ? strlen (f->file) + 1 : 0); free (f); } diff --git a/src/xftglyphs.c b/src/xftglyphs.c index 51fc816..a9d1ecc 100644 --- a/src/xftglyphs.c +++ b/src/xftglyphs.c @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/xftinit.c b/src/xftinit.c index 7cb4bb9..a4ad682 100644 --- a/src/xftinit.c +++ b/src/xftinit.c @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/xftint.h b/src/xftint.h index 9e69900..465bb2e 100644 --- a/src/xftint.h +++ b/src/xftint.h @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * @@ -44,6 +43,16 @@ #include <fontconfig/fcprivate.h> #include <fontconfig/fcfreetype.h> +#ifndef HAVE_CONFIG_H +# if (FREETYPE_MAJOR > 2 || \ + (FREETYPE_MAJOR == 2 && (FREETYPE_MINOR > 1 || \ + (FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 5)))) +# define HAVE_FT_BITMAP_SIZE_Y_PPEM 1 +# else +# define HAVE_FT_BITMAP_SIZE_Y_PPEM 0 +# endif +#endif + typedef struct _XftMatcher { char *object; double (*compare) (char *object, FcValue value1, FcValue value2); diff --git a/src/xftlist.c b/src/xftlist.c index 3f7b390..edf2e52 100644 --- a/src/xftlist.c +++ b/src/xftlist.c @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/xftname.c b/src/xftname.c index a9b9ff4..cac2817 100644 --- a/src/xftname.c +++ b/src/xftname.c @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/xftrender.c b/src/xftrender.c index f027eb4..1cf2882 100644 --- a/src/xftrender.c +++ b/src/xftrender.c @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/xftstr.c b/src/xftstr.c index f6cbd35..85aaf9a 100644 --- a/src/xftstr.c +++ b/src/xftstr.c @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/xftswap.c b/src/xftswap.c index f632a87..e60a646 100644 --- a/src/xftswap.c +++ b/src/xftswap.c @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc. * diff --git a/src/xftxlfd.c b/src/xftxlfd.c index 26a84c9..55d9488 100644 --- a/src/xftxlfd.c +++ b/src/xftxlfd.c @@ -1,5 +1,4 @@ /* - * $Id$ * * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc. * |