/* xpm-ximage.c --- converts XPM data to an XImage for use with OpenGL.
- * xscreensaver, Copyright (c) 1998, 2001, 2002 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1998-2003 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
#include <stdlib.h>
#include <stdio.h>
+#include <X11/Xlib.h>
extern char *progname;
xpm_data = 0;
if (! XpmReadFileToData ((char *) filename, &xpm_data))
{
- fprintf (stderr, "%s: unable to read XPM file %f\n",
+ fprintf (stderr, "%s: unable to read XPM file %s\n",
progname, filename);
exit (1);
}
const char *c = xpm_image.colorTable[i].c_color;
if (!c)
{
- fprintf(stderr, "%s: bogus color table? ($d)\n", progname, i);
+ fprintf(stderr, "%s: bogus color table? (%d)\n", progname, i);
exit (1);
}
else if (!strncasecmp (c, "None", 4))