diff options
| author | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:55 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2011-10-10 17:58:55 +0200 |
| commit | b79164001d1eb06f4591c59b7a7c2c0fb29e992b (patch) | |
| tree | d211626f0f91a07ac22c1b254a6300bebf732ea6 /nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c | |
| parent | 1c25e92b9ea5811d8ab9c2bfdc0dcb2e4d21bd0a (diff) | |
| download | nx-libs-b79164001d1eb06f4591c59b7a7c2c0fb29e992b.tar.gz nx-libs-b79164001d1eb06f4591c59b7a7c2c0fb29e992b.tar.bz2 nx-libs-b79164001d1eb06f4591c59b7a7c2c0fb29e992b.zip | |
Imported nxagent-3.2.0-5.tar.gznxagent/3.2.0-5
Summary: Imported nxagent-3.2.0-5.tar.gz
Keywords:
Imported nxagent-3.2.0-5.tar.gz
into Git repository
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c b/nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c index f51a8bce9..06dabddaa 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c +++ b/nx-X11/programs/Xserver/hw/nxagent/X/NXglyph.c @@ -69,17 +69,6 @@ #undef DEBUG #undef TEST -#else - -#include "picturestr.h" -#include "glyphstr.h" - -#endif - -#if HAVE_STDINT_H -#include <stdint.h> -#elif !defined(UINT32_MAX) -#define UINT32_MAX 0xffffffffU #endif /* @@ -412,12 +401,8 @@ AllocateGlyph (xGlyphInfo *gi, int fdepth) { int size; GlyphPtr glyph; - size_t padded_width; - - padded_width = PixmapBytePad (gi->width, glyphDepths[fdepth]); - if (gi->height && padded_width > (UINT32_MAX - sizeof(GlyphRec))/gi->height) - return 0; - size = gi->height * padded_width; + + size = gi->height * PixmapBytePad (gi->width, glyphDepths[fdepth]); glyph = (GlyphPtr) xalloc (size + sizeof (GlyphRec)); if (!glyph) return 0; |