CVS commit: xsrc/external/mit/libXfont/dist/src/fc
Module Name:xsrc
Committed By: rin
Date: Wed Dec 20 23:07:30 UTC 2017
Modified Files:
xsrc/external/mit/libXfont/dist/src/fc: fserve.c
Log Message:
Fix debug build with LLVM for ILP32 archs.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXfont/dist/src/fc/fserve.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXfont/dist/src/fc/fserve.c
diff -u xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.6 xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.7
--- xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.6 Sun Mar 5 01:07:05 2017
+++ xsrc/external/mit/libXfont/dist/src/fc/fserve.c Wed Dec 20 23:07:30 2017
@@ -1054,7 +1054,7 @@ fs_read_extent_info(FontPathElementPtr f
if (numInfos >= (INT_MAX / sizeof(CharInfoRec))) {
#ifdef DEBUG
fprintf(stderr,
- "fsQueryXExtents16: numInfos (%d) >= %ld\n",
+ "fsQueryXExtents16: numInfos (%d) >= %zu\n",
numInfos, (INT_MAX / sizeof(CharInfoRec)));
#endif
pCI = NULL;
CVS commit: xsrc/external/mit/libXfont/dist/src/bitmap
Module Name:xsrc
Committed By: mrg
Date: Tue Mar 17 18:11:17 UTC 2015
Modified Files:
xsrc/external/mit/libXfont/dist/src/bitmap: bdfread.c
Log Message:
merge Xfont 1.5.1.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c
diff -u xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c:1.3 xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c:1.4
--- xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c:1.3 Tue Jan 7 07:42:25 2014
+++ xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c Tue Mar 17 18:11:17 2015
@@ -62,8 +62,16 @@ from The Open Group.
#if HAVE_STDINT_H
#include stdint.h
-#elif !defined(INT32_MAX)
-#define INT32_MAX 0x7fff
+#else
+# ifndef INT32_MAX
+# define INT32_MAX 0x7fff
+# endif
+# ifndef INT16_MAX
+# define INT16_MAX 0x7fff
+# endif
+# ifndef INT16_MIN
+# define INT16_MIN (0 - 0x8000)
+# endif
#endif
#define INDICES 256
@@ -417,6 +425,12 @@ bdfReadCharacters(FontFilePtr file, Font
bdfError(DWIDTH y value must be zero\n);
goto BAILOUT;
}
+ /* xCharInfo metrics are stored as INT16 */
+ if ((wx 0) || (wx INT16_MAX)) {
+ bdfError(character '%s' has out of range width, %d\n,
+ charName, wx);
+ goto BAILOUT;
+ }
line = bdfGetLine(file, lineBuf, BDFLINELEN);
if ((!line) || (sscanf((char *) line, BBX %d %d %d %d, bw, bh, bl, bb) != 4)) {
bdfError(bad 'BBX'\n);
@@ -427,6 +441,14 @@ bdfReadCharacters(FontFilePtr file, Font
charName, bw, bh);
goto BAILOUT;
}
+ /* xCharInfo metrics are read as int, but stored as INT16 */
+ if ((bl INT16_MAX) || (bl INT16_MIN) ||
+ (bb INT16_MAX) || (bb INT16_MIN) ||
+ (bw (INT16_MAX - bl)) || (bh (INT16_MAX - bb))) {
+ bdfError(character '%s' has out of range metrics, %d %d %d %d\n,
+ charName, bl, (bl+bw), (bh+bb), -bb);
+ goto BAILOUT;
+ }
line = bdfGetLine(file, lineBuf, BDFLINELEN);
if ((line) (bdfIsPrefix(line, ATTRIBUTES))) {
for (p = line + strlen(ATTRIBUTES );
@@ -458,7 +480,10 @@ bdfReadCharacters(FontFilePtr file, Font
ci-metrics.descent = -bb;
ci-metrics.characterWidth = wx;
ci-bits = NULL;
- bdfReadBitmap(ci, file, bit, byte, glyph, scan, bitmapsSizes);
+ if (!bdfReadBitmap(ci, file, bit, byte, glyph, scan, bitmapsSizes)) {
+ bdfError(could not read bitmap for character '%s'\n, charName);
+ goto BAILOUT;
+ }
ci++;
ndx++;
} else
@@ -604,7 +629,9 @@ bdfReadProperties(FontFilePtr file, Font
bdfError(missing 'STARTPROPERTIES'\n);
return (FALSE);
}
-if (sscanf((char *) line, STARTPROPERTIES %d, nProps) != 1) {
+if ((sscanf((char *) line, STARTPROPERTIES %d, nProps) != 1) ||
+ (nProps = 0) ||
+ (nProps ((INT32_MAX / sizeof(FontPropRec)) - BDF_GENPROPS))) {
bdfError(bad 'STARTPROPERTIES'\n);
return (FALSE);
}
CVS commit: xsrc/external/mit/libXfont/dist/src
Module Name:xsrc
Committed By: snj
Date: Wed Feb 25 19:59:36 UTC 2015
Modified Files:
xsrc/external/mit/libXfont/dist/src/FreeType: ftfuncs.c
xsrc/external/mit/libXfont/dist/src/fc: fsconvert.c fserve.c
xsrc/external/mit/libXfont/dist/src/fontfile: dirfile.c
Removed Files:
xsrc/external/mit/libXfont/dist/src/stubs: fatalerror.c
Log Message:
merge libXfont-1.5.0
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c \
xsrc/external/mit/libXfont/dist/src/fc/fserve.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c
cvs rdiff -u -r1.1.1.1 -r0 \
xsrc/external/mit/libXfont/dist/src/stubs/fatalerror.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c
diff -u xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.5 xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.6
--- xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.5 Fri Jul 11 18:55:42 2014
+++ xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c Wed Feb 25 19:59:36 2015
@@ -1069,6 +1069,8 @@ FT_Do_SBit_Metrics( FT_Face ft_face, FT_
#endif
}
+#pragma GCC diagnostic ignored -Wbad-function-cast
+
int
FreeTypeRasteriseGlyph(unsigned idx, int flags, CharInfoPtr tgp,
FTInstancePtr instance, int hasMetrics)
Index: xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c
diff -u xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c:1.3 xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c:1.4
--- xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c:1.3 Fri Jul 11 18:55:42 2014
+++ xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c Wed Feb 25 19:59:36 2015
@@ -643,7 +643,7 @@ _fs_unload_font(FontPtr pfont)
FontPtr
fs_create_font (FontPathElementPtr fpe,
- char *name,
+ const char *name,
int namelen,
fsBitmapFormat format,
fsBitmapFormatMask fmask)
Index: xsrc/external/mit/libXfont/dist/src/fc/fserve.c
diff -u xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.3 xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.4
--- xsrc/external/mit/libXfont/dist/src/fc/fserve.c:1.3 Fri Jul 11 18:55:42 2014
+++ xsrc/external/mit/libXfont/dist/src/fc/fserve.c Wed Feb 25 19:59:36 2015
@@ -147,7 +147,7 @@ static void
_fs_close_server (FSFpePtr conn);
static FSFpePtr
-_fs_init_conn (char *servername);
+_fs_init_conn (const char *servername);
static int
_fs_wait_connect (FSFpePtr conn);
@@ -235,7 +235,7 @@ _fs_add_rep_log (FSFpePtr conn, fsGeneri
#endif
static Bool
-fs_name_check(char *name)
+fs_name_check(const char *name)
{
/* Just make sure there is a protocol/ prefix */
return (name *name != '/' strchr(name, '/'));
@@ -293,7 +293,7 @@ static int
fs_init_fpe(FontPathElementPtr fpe)
{
FSFpePtrconn;
-char *name;
+const char *name;
int err;
int ret;
@@ -1615,7 +1615,7 @@ _fs_do_blocked (FSFpePtr conn)
/* ARGSUSED */
static int
fs_send_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
- char *name, int namelen,
+ const char *name, int namelen,
fsBitmapFormat format, fsBitmapFormatMask fmask,
XID id, FontPtr *ppfont)
{
@@ -1633,7 +1633,7 @@ fs_send_open_font(pointer client, FontPa
if (conn-blockState FS_GIVE_UP)
return BadFontName;
-if (namelen = 0 || namelen sizeof (buf) - 1)
+if (namelen 0 || namelen sizeof (buf) - 1)
return BadFontName;
/*
@@ -1807,7 +1807,7 @@ fs_send_query_bitmaps(FontPathElementPtr
/* ARGSUSED */
static int
fs_open_font(pointer client, FontPathElementPtr fpe, Mask flags,
- char *name, int namelen,
+ const char *name, int namelen,
fsBitmapFormat format, fsBitmapFormatMask fmask,
XID id, FontPtr *ppfont,
char **alias, FontPtr non_cachable_font)
@@ -1956,19 +1956,6 @@ fs_read_glyphs(FontPathElementPtr fpe, F
buf += SIZEOF (fsOffset32) * (rep-num_chars);
bufleft -= SIZEOF (fsOffset32) * (rep-num_chars);
-#if 0
-if (bufleft rep-nbytes)
-{
-#ifdef DEBUG
-fprintf(stderr,
-fsQueryXBitmaps16: nbytes (%d) bufleft (%ld)\n,
-rep-nbytes, bufleft);
-#endif
-err = AllocError;
-goto bail;
-}
-#endif
-
if (bufleft rep-nbytes)
{
#ifdef DEBUG
@@ -2174,7 +2161,7 @@ fs_send_load_glyphs(pointer client, Font
}
-extern pointer serverClient; /* This could be any number that
+extern pointer __GetServerClient(void); /* This could be any number that
doesn't conflict with existing
client values. */
@@ -2346,17 +2333,17 @@ fs_load_all_glyphs(FontPtr pfont)
* perform an unpleasant job that, we hope, will never be required.
*/
-while ((err = _fs_load_glyphs(serverClient,
CVS commit: xsrc/external/mit/libXfont/dist/src/fontfile
Module Name:xsrc
Committed By: christos
Date: Thu Sep 18 19:23:10 UTC 2014
Modified Files:
xsrc/external/mit/libXfont/dist/src/fontfile: fileio.c filewr.c
Log Message:
Set close-on-exec for font file i/o.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c \
xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c
diff -u xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c:1.1.1.3 xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c:1.2
--- xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c:1.1.1.3 Thu May 30 21:08:57 2013
+++ xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c Thu Sep 18 15:23:10 2014
@@ -36,6 +36,9 @@ in this Software without prior written a
#ifndef O_BINARY
#define O_BINARY O_RDONLY
#endif
+#ifndef O_CLOEXEC
+#define O_CLOEXEC 0
+#endif
FontFilePtr
FontFileOpen (const char *name)
@@ -44,7 +47,7 @@ FontFileOpen (const char *name)
int len;
BufFilePtr raw, cooked;
-fd = open (name, O_BINARY);
+fd = open (name, O_BINARY|O_CLOEXEC);
if (fd 0)
return 0;
raw = BufFileOpenRead (fd);
Index: xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c
diff -u xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c:1.1.1.3 xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c:1.2
--- xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c:1.1.1.3 Thu May 30 21:08:57 2013
+++ xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c Thu Sep 18 15:23:10 2014
@@ -33,17 +33,19 @@ in this Software without prior written a
#endif
#include X11/fonts/fntfilio.h
#include X11/Xos.h
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+#ifndef O_CLOEXEC
+#define O_CLOEXEC 0
+#endif
FontFilePtr
FontFileOpenWrite (const char *name)
{
int fd;
-#if defined(WIN32) || defined(__CYGWIN__)
-fd = open (name, O_CREAT|O_TRUNC|O_RDWR|O_BINARY, 0666);
-#else
-fd = creat (name, 0666);
-#endif
+fd = open (name, O_CREAT|O_TRUNC|O_RDWR|O_BINARY|O_CLOEXEC, 0666);
if (fd 0)
return 0;
return (FontFilePtr) BufFileOpenWrite (fd);
CVS commit: xsrc/external/mit/libXfont/dist/src/bitmap
Module Name:xsrc
Committed By: wiz
Date: Tue Jan 7 07:41:59 UTC 2014
Modified Files:
xsrc/external/mit/libXfont/dist/src/bitmap: bdfread.c
Log Message:
CVS-2013-6462:
From aeabb3efa6905e11c479e2e5319f2b6b3ab22009 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith alan.coopersm...@oracle.com
Date: Mon, 23 Dec 2013 18:34:02 -0800
Subject: [PATCH:libXfont 1/2] CVE-2013-: unlimited sscanf can overflow
stack buffer in bdfReadCharacters()
Fixes cppcheck warning:
[lib/libXfont/src/bitmap/bdfread.c:341]: (warning)
scanf without field width limits can crash with huge input data.
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
Reviewed-by: Matthieu Herrb matth...@herrb.eu
Reviewed-by: Jeremy Huddleston Sequoia jerem...@apple.com
---
src/bitmap/bdfread.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c
diff -u xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c:1.1.1.3 xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c:1.2
--- xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c:1.1.1.3 Fri May 31 01:08:57 2013
+++ xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c Tue Jan 7 07:41:59 2014
@@ -338,7 +338,7 @@ bdfReadCharacters(FontFilePtr file, Font
charcharName[100];
int ignore;
- if (sscanf((char *) line, STARTCHAR %s, charName) != 1) {
+ if (sscanf((char *) line, STARTCHAR %99s, charName) != 1) {
bdfError(bad character name in BDF file\n);
goto BAILOUT; /* bottom of function, free and return error */
}
CVS commit: xsrc/external/mit/libXfont/dist/src/bitmap
Module Name:xsrc
Committed By: wiz
Date: Tue Jan 7 07:42:25 UTC 2014
Modified Files:
xsrc/external/mit/libXfont/dist/src/bitmap: bdfread.c
Log Message:
Additional hardening from upstream:
From f8b21df399fbedd08da88752181b8a290a38d890 Mon Sep 17 00:00:00 2001
From: Alan Coopersmith alan.coopersm...@oracle.com
Date: Mon, 23 Dec 2013 19:01:11 -0800
Subject: [PATCH:libXfont 2/2] Limit additional sscanf strings to fit buffer
sizes
None of these could currently result in buffer overflow, as the input
and output buffers were the same size, but adding limits helps ensure
we keep it that way, if we ever resize any of these in the future.
Fixes cppcheck warnings:
[lib/libXfont/src/bitmap/bdfread.c:547]: (warning)
scanf without field width limits can crash with huge input data.
[lib/libXfont/src/bitmap/bdfread.c:553]: (warning)
scanf without field width limits can crash with huge input data.
[lib/libXfont/src/bitmap/bdfread.c:636]: (warning)
scanf without field width limits can crash with huge input data.
Signed-off-by: Alan Coopersmith alan.coopersm...@oracle.com
Reviewed-by: Matthieu Herrb matth...@herrb.eu
Reviewed-by: Jeremy Huddleston Sequoia jerem...@apple.com
---
src/bitmap/bdfread.c | 14 +++---
1 file changed, 11 insertions(+), 3 deletions(-)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c
diff -u xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c:1.2 xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c:1.3
--- xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c:1.2 Tue Jan 7 07:41:59 2014
+++ xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c Tue Jan 7 07:42:25 2014
@@ -69,6 +69,7 @@ from The Open Group.
#define INDICES 256
#define MAXENCODING 0x
#define BDFLINELEN 1024
+#define BDFLINESTR %1023s /* scanf specifier to read a BDFLINELEN string */
static Bool bdfPadToTerminal(FontPtr pFont);
extern int bdfFileLineNum;
@@ -544,13 +545,18 @@ bdfReadHeader(FontFilePtr file, bdfFileS
unsigned charlineBuf[BDFLINELEN];
line = bdfGetLine(file, lineBuf, BDFLINELEN);
-if (!line || sscanf((char *) line, STARTFONT %s, namebuf) != 1 ||
+if (!line ||
+sscanf((char *) line, STARTFONT BDFLINESTR, namebuf) != 1 ||
!bdfStrEqual(namebuf, 2.1)) {
bdfError(bad 'STARTFONT'\n);
return (FALSE);
}
line = bdfGetLine(file, lineBuf, BDFLINELEN);
-if (!line || sscanf((char *) line, FONT %[^\n], pState-fontName) != 1) {
+#if MAXFONTNAMELEN != 1024
+# error need to adjust sscanf length limit to be MAXFONTNAMELEN - 1
+#endif
+if (!line ||
+sscanf((char *) line, FONT %1023[^\n], pState-fontName) != 1) {
bdfError(bad 'FONT'\n);
return (FALSE);
}
@@ -633,7 +639,9 @@ bdfReadProperties(FontFilePtr file, Font
while (*line isspace(*line))
line++;
- switch (sscanf((char *) line, %s%s%s, namebuf, secondbuf, thirdbuf)) {
+ switch (sscanf((char *) line,
+ BDFLINESTR BDFLINESTR BDFLINESTR,
+ namebuf, secondbuf, thirdbuf)) {
default:
bdfError(missing '%s' parameter value\n, namebuf);
goto BAILOUT;
CVS commit: xsrc/external/mit/libXfont/dist
Module Name:xsrc
Committed By: mrg
Date: Fri May 31 01:18:45 UTC 2013
Modified Files:
xsrc/external/mit/libXfont/dist/src/FreeType: ftfuncs.c
xsrc/external/mit/libXfont/dist/src/bitmap: pcfread.c
xsrc/external/mit/libXfont/dist/src/fontfile: bunzip2.c decompress.c
Removed Files:
xsrc/external/mit/libXfont/dist/doc: fontlib.css fontlib.xsl
Log Message:
merge libXfont 1.4.5
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/libXfont/dist/doc/fontlib.css \
xsrc/external/mit/libXfont/dist/doc/fontlib.xsl
cvs rdiff -u -r1.2 -r1.3 \
xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c \
xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c
diff -u xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.2 xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.3
--- xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.2 Thu Aug 11 22:12:07 2011
+++ xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c Fri May 31 01:18:45 2013
@@ -25,9 +25,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTR
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.11 2005/07/03 07:00:58 daniels Exp $ */
-
-/* $XFree86: xc/lib/font/FreeType/ftfuncs.c,v 1.43 2004/02/07 04:37:18 dawes Exp $ */
#ifdef HAVE_CONFIG_H
#include config.h
@@ -51,7 +48,7 @@ THE SOFTWARE.
#include FT_BBOX_H
#include FT_TRUETYPE_TAGS_H
/*
- * If you want to use FT_Outline_Get_CBox instead of
+ * If you want to use FT_Outline_Get_CBox instead of
* FT_Outline_Get_BBox, define here.
*/
/* #define USE_GET_CBOX */
@@ -97,7 +94,7 @@ static CharInfoRec noSuchChar = { /* met
/* The propery names for all the XLFD properties. */
-static char *xlfd_props[] = {
+static const char *xlfd_props[] = {
FOUNDRY,
FAMILY_NAME,
WEIGHT_NAME,
@@ -163,7 +160,7 @@ iceil(int x, int y)
{
return ifloor(x + y - 1, y);
}
-
+
static int
FreeTypeOpenFace(FTFacePtr *facep, char *FTFileName, char *realFileName, int faceNumber)
{
@@ -188,7 +185,7 @@ FreeTypeOpenFace(FTFacePtr *facep, char
otherFace = otherFace-next;
}
if(otherFace) {
-MUMBLE1(Returning cached face: %s\n, otherFace-filename);
+MUMBLE(Returning cached face: %s\n, otherFace-filename);
*facep = otherFace;
return Successful;
}
@@ -253,7 +250,7 @@ FreeTypeFreeFace(FTFacePtr face)
else
ErrorF(FreeType: freeing unknown face\n);
}
-MUMBLE1(Closing face: %s\n, face-filename);
+MUMBLE(Closing face: %s\n, face-filename);
FT_Done_Face(face-face);
free(face-filename);
free(face);
@@ -270,7 +267,7 @@ TransEqual(FTNormalisedTransformationPtr
else if(t1-nonIdentity != t2-nonIdentity)
return 0;
else if(t1-nonIdentity t2-nonIdentity) {
-return
+return
t1-matrix.xx == t2-matrix.xx
t1-matrix.yx == t2-matrix.yx
t1-matrix.yy == t2-matrix.yy
@@ -303,7 +300,7 @@ TTCapEqual(struct TTCapInfo *t1, struct
t1-flags == t2-flags
t1-scaleBitmap == t2-scaleBitmap
/*
- If we use forceConstantSpacing,
+ If we use forceConstantSpacing,
we *MUST* allocate new instance.
*/
t1-forceConstantSpacingEnd 0
@@ -314,7 +311,7 @@ static int
FTInstanceMatch(FTInstancePtr instance,
char *FTFileName, FTNormalisedTransformationPtr trans,
int spacing, FontBitmapFormatPtr bmfmt,
- struct TTCapInfo *tmp_ttcap, FT_Int32 load_flags)
+ struct TTCapInfo *tmp_ttcap, FT_Int32 load_flags)
{
if(strcmp(instance-face-filename, FTFileName) != 0) {
return 0;
@@ -350,7 +347,7 @@ FreeTypeActivateInstance(FTInstancePtr i
instance-transformation.nonIdentity ?
instance-transformation.matrix : 0,
0);
-
+
instance-face-active_instance = instance;
return Successful;
}
@@ -380,7 +377,7 @@ FTFindSize(FT_Face face, FTNormalisedTra
j = i;
d = dd;
}
-}
+}
}
if(j 0)
return BadFontName;
@@ -533,7 +530,7 @@ FreeTypeOpenInstance(FTInstancePtr *inst
/* maintain a linked list of instances */
instance-next = instance-face-instances;
instance-face-instances = instance;
-
+
*instance_return = instance;
return Successful;
}
@@ -550,7 +547,7 @@ FreeTypeFreeInstance(FTInstancePtr insta
instance-refcount--;
if(instance-refcount = 0) {
CVS commit: xsrc/external/mit/libXfont/dist/src/bitmap
Module Name:xsrc Committed By: cheusov Date: Sat May 19 05:16:27 UTC 2012 Modified Files: xsrc/external/mit/libXfont/dist/src/bitmap: pcfread.c Log Message: fix in libxfont: An uninitialized pointer causes a crash if pcf header is corrupted (upstream patch). To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c diff -u xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c:1.1.1.2 xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c:1.2 --- xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c:1.1.1.2 Wed Jun 10 07:33:40 2009 +++ xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c Sat May 19 05:16:27 2012 @@ -408,6 +408,8 @@ pcfReadFont(FontPtr pFont, FontFilePtr f pFont-info.nprops = 0; pFont-info.props = 0; +pFont-info.isStringProp=0; + if (!(tables = pcfReadTOC(file, ntables))) goto Bail;
CVS commit: xsrc/external/mit/libXfont/dist/src/fontfile
Module Name:xsrc
Committed By: christos
Date: Mon Aug 15 21:19:27 UTC 2011
Modified Files:
xsrc/external/mit/libXfont/dist/src/fontfile: decompress.c
Log Message:
P
Fix CVS-2011-2895, buffer overflow in decompress
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c
diff -u xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c:1.1.1.2 xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c:1.2
--- xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c:1.1.1.2 Wed Jun 10 03:33:40 2009
+++ xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c Mon Aug 15 17:19:27 2011
@@ -261,6 +261,8 @@
*/
while ( code = 256 )
{
+ if (stackp - de_stack = STACK_SIZE - 1)
+ return BUFFILEEOF;
*stackp++ = file-tab_suffix[code];
code = file-tab_prefix[code];
}
CVS commit: xsrc/external/mit/libXfont/dist/src/FreeType
Module Name:xsrc Committed By: joerg Date: Thu Aug 11 22:12:07 UTC 2011 Modified Files: xsrc/external/mit/libXfont/dist/src/FreeType: ftfuncs.c Log Message: Assume for a moment that the intention here is to do something useful. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 \ xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c diff -u xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.1.1.2 xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.2 --- xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c:1.1.1.2 Wed Jun 10 07:33:40 2009 +++ xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c Thu Aug 11 22:12:07 2011 @@ -125,7 +125,7 @@ FT_ULong len = sizeof(buff); FT_UShort result = 0; - if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, len ) ); + if ( !FT_Load_Sfnt_Table( face, table_tag, table_offset, buff, len ) ) result = (FT_UShort)( (buff[0] 8) | buff[1] ); return result;
CVS commit: xsrc/external/mit/libXfont/dist
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 10:46:18 UTC 2010 Update of /cvsroot/xsrc/external/mit/libXfont/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11627 Log Message: initial import of libXfont-1.4.2 Status: Vendor Tag: xorg Release Tags: libXfont-1-4-2 U xsrc/external/mit/libXfont/dist/COPYING U xsrc/external/mit/libXfont/dist/Makefile.am U xsrc/external/mit/libXfont/dist/install-sh U xsrc/external/mit/libXfont/dist/configure.ac U xsrc/external/mit/libXfont/dist/configure U xsrc/external/mit/libXfont/dist/README U xsrc/external/mit/libXfont/dist/config.sub U xsrc/external/mit/libXfont/dist/depcomp U xsrc/external/mit/libXfont/dist/ltmain.sh U xsrc/external/mit/libXfont/dist/missing U xsrc/external/mit/libXfont/dist/AUTHORS U xsrc/external/mit/libXfont/dist/config.guess U xsrc/external/mit/libXfont/dist/xfont.pc.in U xsrc/external/mit/libXfont/dist/ChangeLog U xsrc/external/mit/libXfont/dist/Makefile.in U xsrc/external/mit/libXfont/dist/aclocal.m4 U xsrc/external/mit/libXfont/dist/config.h.in N xsrc/external/mit/libXfont/dist/INSTALL U xsrc/external/mit/libXfont/dist/doc/fontlib.xml U xsrc/external/mit/libXfont/dist/doc/fontlib.css U xsrc/external/mit/libXfont/dist/doc/fontlib.xsl U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontconf.h.in U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontxlfd.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/bdfint.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontmisc.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/bufio.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfilst.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontencc.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/bitmap.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontshow.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfil.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfilio.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/pcf.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontutil.h U xsrc/external/mit/libXfont/dist/src/Makefile.am U xsrc/external/mit/libXfont/dist/src/dummy.c U xsrc/external/mit/libXfont/dist/src/Makefile.in U xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.am U xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.h U xsrc/external/mit/libXfont/dist/src/FreeType/fttools.c U xsrc/external/mit/libXfont/dist/src/FreeType/xttcap.c U xsrc/external/mit/libXfont/dist/src/FreeType/xttcap.h U xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c U xsrc/external/mit/libXfont/dist/src/FreeType/ft.h U xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.in U xsrc/external/mit/libXfont/dist/src/FreeType/ftenc.c U xsrc/external/mit/libXfont/dist/src/stubs/getnewfntcid.c U xsrc/external/mit/libXfont/dist/src/stubs/Makefile.am U xsrc/external/mit/libXfont/dist/src/stubs/findoldfnt.c U xsrc/external/mit/libXfont/dist/src/stubs/delfntcid.c U xsrc/external/mit/libXfont/dist/src/stubs/stfntcfnt.c U xsrc/external/mit/libXfont/dist/src/stubs/regfpefunc.c U xsrc/external/mit/libXfont/dist/src/stubs/gettime.c U xsrc/external/mit/libXfont/dist/src/stubs/fatalerror.c U xsrc/external/mit/libXfont/dist/src/stubs/errorf.c U xsrc/external/mit/libXfont/dist/src/stubs/getdefptsize.c U xsrc/external/mit/libXfont/dist/src/stubs/servclient.c U xsrc/external/mit/libXfont/dist/src/stubs/initfshdl.c U xsrc/external/mit/libXfont/dist/src/stubs/stubs.h U xsrc/external/mit/libXfont/dist/src/stubs/setfntauth.c U xsrc/external/mit/libXfont/dist/src/stubs/csignal.c U xsrc/external/mit/libXfont/dist/src/stubs/Makefile.in U xsrc/external/mit/libXfont/dist/src/stubs/getcres.c U xsrc/external/mit/libXfont/dist/src/stubs/rmfshdl.c U xsrc/external/mit/libXfont/dist/src/stubs/cauthgen.c U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.am U xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontfile.c U xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c U xsrc/external/mit/libXfont/dist/src/fontfile/decompress.c U xsrc/external/mit/libXfont/dist/src/fontfile/bitsource.c U xsrc/external/mit/libXfont/dist/src/fontfile/gunzip.c U xsrc/external/mit/libXfont/dist/src/fontfile/catalogue.c U xsrc/external/mit/libXfont/dist/src/fontfile/defaults.c U xsrc/external/mit/libXfont/dist/src/fontfile/dirfile.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontscale.c U xsrc/external/mit/libXfont/dist/src/fontfile/renderers.c U xsrc/external/mit/libXfont/dist/src/fontfile/register.c U xsrc/external/mit/libXfont/dist/src/fontfile/bufio.c U xsrc/external/mit/libXfont/dist/src/fontfile/Makefile.in U xsrc/external/mit/libXfont/dist/src/fontfile/fontdir.c C xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c U xsrc/external/mit/libXfont/dist/src/fontfile/fontencc.c U xsrc/external/mit/libXfont/dist/src/builtins/Makefile.am U xsrc/external/mit/libXfont/dist/src/builtins/dir.c U xsrc/external/mit/libXfont/dist/src/builtins/fpe.c U
CVS commit: xsrc/external/mit/libXfont/dist/src/fontfile
Module Name:xsrc Committed By: mrg Date: Sat Aug 14 10:50:32 UTC 2010 Modified Files: xsrc/external/mit/libXfont/dist/src/fontfile: bunzip2.c Log Message: merge libXfont 1.4.2. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c diff -u xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c:1.2 xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c:1.3 --- xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c:1.2 Wed Jun 10 07:51:31 2009 +++ xsrc/external/mit/libXfont/dist/src/fontfile/bunzip2.c Sat Aug 14 10:50:32 2010 @@ -2,33 +2,28 @@ written by Mark Eichin eic...@kitten.gen.ma.us September 1996. intended for inclusion in X11 public releases. */ -/* Copyright 2008 Sun Microsystems, Inc. All rights reserved. +/* + * Copyright © 2008 Sun Microsystems, Inc. All rights reserved. * * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * Software), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, and/or sell copies of the Software, and to permit persons - * to whom the Software is furnished to do so, provided that the above - * copyright notice(s) and this permission notice appear in all copies of - * the Software and that both the above copyright notice(s) and this - * permission notice appear in supporting documentation. + * copy of this software and associated documentation files (the Software), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: * - * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT - * OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL - * INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING - * FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION - * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. * - * Except as contained in this notice, the name of a copyright holder - * shall not be used in advertising or otherwise to promote the sale, use - * or other dealings in this Software without prior written authorization - * of the copyright holder. - */ + * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * 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. + */ #ifdef HAVE_CONFIG_H
CVS commit: xsrc/external/mit/libXfont/dist
Module Name:xsrc Committed By: mrg Date: Mon Nov 9 06:22:32 UTC 2009 Update of /cvsroot/xsrc/external/mit/libXfont/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3279 Log Message: initial import of libXfont-1.4.1 Status: Vendor Tag: xorg Release Tags: libXfont-1-4-1 U xsrc/external/mit/libXfont/dist/config.h.in U xsrc/external/mit/libXfont/dist/missing U xsrc/external/mit/libXfont/dist/xfont.pc.in U xsrc/external/mit/libXfont/dist/depcomp U xsrc/external/mit/libXfont/dist/aclocal.m4 U xsrc/external/mit/libXfont/dist/README U xsrc/external/mit/libXfont/dist/install-sh U xsrc/external/mit/libXfont/dist/COPYING U xsrc/external/mit/libXfont/dist/ltmain.sh U xsrc/external/mit/libXfont/dist/AUTHORS U xsrc/external/mit/libXfont/dist/configure.ac U xsrc/external/mit/libXfont/dist/config.guess U xsrc/external/mit/libXfont/dist/Makefile.in U xsrc/external/mit/libXfont/dist/ChangeLog U xsrc/external/mit/libXfont/dist/Makefile.am U xsrc/external/mit/libXfont/dist/config.sub U xsrc/external/mit/libXfont/dist/configure U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontconf.h.in U xsrc/external/mit/libXfont/dist/include/X11/fonts/pcf.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfil.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontxlfd.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontmisc.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontshow.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfilio.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/bufio.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/bitmap.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/bdfint.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontencc.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fntfilst.h U xsrc/external/mit/libXfont/dist/include/X11/fonts/fontutil.h N xsrc/external/mit/libXfont/dist/doc/fontlib.css N xsrc/external/mit/libXfont/dist/doc/fontlib.xml N xsrc/external/mit/libXfont/dist/doc/fontlib.xsl U xsrc/external/mit/libXfont/dist/src/dummy.c U xsrc/external/mit/libXfont/dist/src/Makefile.in U xsrc/external/mit/libXfont/dist/src/Makefile.am U xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.c U xsrc/external/mit/libXfont/dist/src/FreeType/xttcap.h U xsrc/external/mit/libXfont/dist/src/FreeType/ftenc.c U xsrc/external/mit/libXfont/dist/src/FreeType/xttcap.c U xsrc/external/mit/libXfont/dist/src/FreeType/fttools.c U xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.in U xsrc/external/mit/libXfont/dist/src/FreeType/ftfuncs.h U xsrc/external/mit/libXfont/dist/src/FreeType/Makefile.am U xsrc/external/mit/libXfont/dist/src/FreeType/ft.h U xsrc/external/mit/libXfont/dist/src/bitmap/bdfread.c U xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.in U xsrc/external/mit/libXfont/dist/src/bitmap/bitmap.c U xsrc/external/mit/libXfont/dist/src/bitmap/bitscale.c U xsrc/external/mit/libXfont/dist/src/bitmap/bitmaputil.c U xsrc/external/mit/libXfont/dist/src/bitmap/Makefile.am U xsrc/external/mit/libXfont/dist/src/bitmap/bitmapfunc.c U xsrc/external/mit/libXfont/dist/src/bitmap/snfstr.h U xsrc/external/mit/libXfont/dist/src/bitmap/pcfread.c U xsrc/external/mit/libXfont/dist/src/bitmap/pcfwrite.c U xsrc/external/mit/libXfont/dist/src/bitmap/snfread.c U xsrc/external/mit/libXfont/dist/src/bitmap/fontink.c U xsrc/external/mit/libXfont/dist/src/bitmap/bdfutils.c U xsrc/external/mit/libXfont/dist/src/stubs/getdefptsize.c U xsrc/external/mit/libXfont/dist/src/stubs/findoldfnt.c U xsrc/external/mit/libXfont/dist/src/stubs/stfntcfnt.c U xsrc/external/mit/libXfont/dist/src/stubs/errorf.c U xsrc/external/mit/libXfont/dist/src/stubs/initfshdl.c U xsrc/external/mit/libXfont/dist/src/stubs/delfntcid.c U xsrc/external/mit/libXfont/dist/src/stubs/getnewfntcid.c U xsrc/external/mit/libXfont/dist/src/stubs/regfpefunc.c U xsrc/external/mit/libXfont/dist/src/stubs/gettime.c U xsrc/external/mit/libXfont/dist/src/stubs/Makefile.in U xsrc/external/mit/libXfont/dist/src/stubs/cauthgen.c U xsrc/external/mit/libXfont/dist/src/stubs/stubs.h U xsrc/external/mit/libXfont/dist/src/stubs/setfntauth.c U xsrc/external/mit/libXfont/dist/src/stubs/csignal.c U xsrc/external/mit/libXfont/dist/src/stubs/getcres.c U xsrc/external/mit/libXfont/dist/src/stubs/Makefile.am U xsrc/external/mit/libXfont/dist/src/stubs/fatalerror.c U xsrc/external/mit/libXfont/dist/src/stubs/rmfshdl.c U xsrc/external/mit/libXfont/dist/src/stubs/servclient.c U xsrc/external/mit/libXfont/dist/src/fc/fstrans.c U xsrc/external/mit/libXfont/dist/src/fc/fserve.h U xsrc/external/mit/libXfont/dist/src/fc/fservestr.h U xsrc/external/mit/libXfont/dist/src/fc/fsio.c U xsrc/external/mit/libXfont/dist/src/fc/fsconvert.c U xsrc/external/mit/libXfont/dist/src/fc/fserve.c U xsrc/external/mit/libXfont/dist/src/fc/fslibos.h U xsrc/external/mit/libXfont/dist/src/fc/Makefile.in U xsrc/external/mit/libXfont/dist/src/fc/Makefile.am U xsrc/external/mit/libXfont/dist/src/fc/fsio.h U
CVS commit: xsrc/external/mit/libXfont/dist
Module Name:xsrc Committed By: mrg Date: Wed Jun 10 07:39:43 UTC 2009 Removed Files: xsrc/external/mit/libXfont/dist: autogen.sh xsrc/external/mit/libXfont/dist/include/X11/fonts: fontmod.h xsrc/external/mit/libXfont/dist/src/Speedo: Makefile.am Makefile.in adobe-iso.h bics-iso.h bics-unicode.c bics-unicode.h do_char.c do_trns.c keys.h out_bl2d.c out_blk.c out_outl.c out_scrn.c out_util.c reset.c set_spcs.c set_trns.c spdo_prv.h speedo.h spencode.c sperr.c spfile.c spfont.c spfuncs.c spglyph.c spinfo.c spint.h useropt.h xsrc/external/mit/libXfont/dist/src/Type1: Makefile.am Makefile.in arith.c arith.h blues.h cluts.h curves.c curves.h digit.h fontfcn.c fontfcn.h fonts.h hdigit.h hints.c hints.h lines.c lines.h objects.c objects.h paths.c paths.h pictures.h regions.c regions.h scanfont.c spaces.c spaces.h strokes.h t1funcs.c t1hdigit.h t1imager.h t1info.c t1intf.h t1io.c t1malloc.c t1snap.c t1stdio.h t1unicode.c t1unicode.h token.c token.h tokst.h trig.h type1.c util.c util.h xsrc/external/mit/libXfont/dist/src/fontcache: Makefile.am Makefile.in fcqueue.h fontcache.c fontcache.h xsrc/external/mit/libXfont/dist/src/fontfile: ffcheck.c printerfont.c xsrc/external/mit/libXfont/dist/src/stubs: fontmod.c xpstubs.c Log Message: merge libXfont 1.4.0 To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXfont/dist/autogen.sh cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/libXfont/dist/include/X11/fonts/fontmod.h cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/libXfont/dist/src/Speedo/Makefile.am \ xsrc/external/mit/libXfont/dist/src/Speedo/Makefile.in \ xsrc/external/mit/libXfont/dist/src/Speedo/adobe-iso.h \ xsrc/external/mit/libXfont/dist/src/Speedo/bics-iso.h \ xsrc/external/mit/libXfont/dist/src/Speedo/bics-unicode.c \ xsrc/external/mit/libXfont/dist/src/Speedo/bics-unicode.h \ xsrc/external/mit/libXfont/dist/src/Speedo/keys.h \ xsrc/external/mit/libXfont/dist/src/Speedo/spdo_prv.h \ xsrc/external/mit/libXfont/dist/src/Speedo/speedo.h \ xsrc/external/mit/libXfont/dist/src/Speedo/spencode.c \ xsrc/external/mit/libXfont/dist/src/Speedo/sperr.c \ xsrc/external/mit/libXfont/dist/src/Speedo/spfile.c \ xsrc/external/mit/libXfont/dist/src/Speedo/spfont.c \ xsrc/external/mit/libXfont/dist/src/Speedo/spfuncs.c \ xsrc/external/mit/libXfont/dist/src/Speedo/spglyph.c \ xsrc/external/mit/libXfont/dist/src/Speedo/spinfo.c \ xsrc/external/mit/libXfont/dist/src/Speedo/spint.h \ xsrc/external/mit/libXfont/dist/src/Speedo/useropt.h cvs rdiff -u -r1.2 -r0 xsrc/external/mit/libXfont/dist/src/Speedo/do_char.c \ xsrc/external/mit/libXfont/dist/src/Speedo/do_trns.c \ xsrc/external/mit/libXfont/dist/src/Speedo/out_bl2d.c \ xsrc/external/mit/libXfont/dist/src/Speedo/out_blk.c \ xsrc/external/mit/libXfont/dist/src/Speedo/out_outl.c \ xsrc/external/mit/libXfont/dist/src/Speedo/out_scrn.c \ xsrc/external/mit/libXfont/dist/src/Speedo/reset.c \ xsrc/external/mit/libXfont/dist/src/Speedo/set_spcs.c \ xsrc/external/mit/libXfont/dist/src/Speedo/set_trns.c cvs rdiff -u -r1.3 -r0 xsrc/external/mit/libXfont/dist/src/Speedo/out_util.c cvs rdiff -u -r1.1.1.1 -r0 \ xsrc/external/mit/libXfont/dist/src/Type1/Makefile.am \ xsrc/external/mit/libXfont/dist/src/Type1/Makefile.in \ xsrc/external/mit/libXfont/dist/src/Type1/arith.c \ xsrc/external/mit/libXfont/dist/src/Type1/arith.h \ xsrc/external/mit/libXfont/dist/src/Type1/blues.h \ xsrc/external/mit/libXfont/dist/src/Type1/cluts.h \ xsrc/external/mit/libXfont/dist/src/Type1/curves.c \ xsrc/external/mit/libXfont/dist/src/Type1/curves.h \ xsrc/external/mit/libXfont/dist/src/Type1/digit.h \ xsrc/external/mit/libXfont/dist/src/Type1/fontfcn.c \ xsrc/external/mit/libXfont/dist/src/Type1/fontfcn.h \ xsrc/external/mit/libXfont/dist/src/Type1/fonts.h \ xsrc/external/mit/libXfont/dist/src/Type1/hdigit.h \ xsrc/external/mit/libXfont/dist/src/Type1/hints.c \ xsrc/external/mit/libXfont/dist/src/Type1/hints.h \ xsrc/external/mit/libXfont/dist/src/Type1/lines.c \ xsrc/external/mit/libXfont/dist/src/Type1/lines.h \ xsrc/external/mit/libXfont/dist/src/Type1/objects.c \ xsrc/external/mit/libXfont/dist/src/Type1/objects.h \ xsrc/external/mit/libXfont/dist/src/Type1/paths.c \ xsrc/external/mit/libXfont/dist/src/Type1/paths.h \ xsrc/external/mit/libXfont/dist/src/Type1/pictures.h \ xsrc/external/mit/libXfont/dist/src/Type1/regions.c \ xsrc/external/mit/libXfont/dist/src/Type1/regions.h \ xsrc/external/mit/libXfont/dist/src/Type1/scanfont.c \ xsrc/external/mit/libXfont/dist/src/Type1/spaces.c \ xsrc/external/mit/libXfont/dist/src/Type1/spaces.h \
