qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert local debug stuff that wasn't meant to be committed.

Browse Source
This commit is contained in:
matthieu 2007-03-25 13:22:40 +00:00
parent 00a847b3f8
commit 77cb7f251b
4 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/freetype/src/bdf/bdflib.c
View File

@ -1478,7 +1478,6 @@
goto Exit;
p->cnt = font->glyphs_size = _bdf_atoul( p->list.field[1], 0, 10 );
printf("XXX %lu\n", p->cnt);
/* Make sure the number of glyphs is non-zero. */
if ( p->cnt == 0 )
font->glyphs_size = 64;

2
lib/libX11/src/ImUtil.c
View File

@ -385,8 +385,6 @@ Status XInitImage (image)
XImage *image;
{
if (image->depth == 0 || image->depth > 32 ||
image->bits_per_pixel > 32 || image->bitmap_unit > 32 ||
image->bits_per_pixel < 0 || image->bitmap_unit < 0 ||
(image->format != XYBitmap &&
image->format != XYPixmap &&
image->format != ZPixmap) ||

11
lib/libXfont/src/bitmap/bdfread.c
View File

@ -65,12 +65,6 @@ from The Open Group.
#include <X11/fonts/bitmap.h>
#include <X11/fonts/bdfint.h>
#if HAVE_STDINT_H
#include <stdint.h>
#elif !defined(INT32_MAX)
#define INT32_MAX 0x7fffffff
#endif
#define INDICES 256
#define MAXENCODING 0xFFFF
#define BDFLINELEN 1024
@ -294,11 +288,6 @@ bdfReadCharacters(FontFilePtr file, FontPtr pFont, bdfFileState *pState,
bdfError("invalid number of CHARS in BDF file\n");
return (FALSE);
}
if (nchars > INT32_MAX / sizeof(CharInfoRec)) {
bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,
sizeof(CharInfoRec));
goto BAILOUT;
}
ci = (CharInfoPtr) xalloc(nchars * sizeof(CharInfoRec));
if (!ci) {
bdfError("Couldn't allocate pCI (%d*%d)\n", nchars,

8
lib/libXfont/src/fontfile/fontdir.c
View File

@ -38,17 +38,9 @@ in this Software without prior written authorization from The Open Group.
#include <X11/fonts/fntfilst.h>
#include <X11/keysym.h>
#if HAVE_STDINT_H
#include <stdint.h>
#elif !defined(INT32_MAX)
#define INT32_MAX 0x7fffffff
#endif
Bool
FontFileInitTable (FontTablePtr table, int size)
{
if (size < 0 || (size > INT32_MAX/sizeof(FontEntryRec)))
return FALSE;
if (size)
{
table->entries = (FontEntryPtr) xalloc(sizeof(FontEntryRec) * size);