X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utils%2Fminixpm.c;h=13a8ab3ce6cda1a866e3136726e424ae7819daed;hb=6afd6db0ae9396cd7ff897ade597cd5483f49b0e;hp=7ec5611d644a7b0c5bbffad9e8dd64d4e6b20e27;hpb=49f5b54f312fe4ac2e9bc47581a72451bd0e8439;p=xscreensaver

diff --git a/utils/minixpm.c b/utils/minixpm.c
index 7ec5611d..13a8ab3c 100644
--- a/utils/minixpm.c
+++ b/utils/minixpm.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2001-2006 Jamie Zawinski <jwz@jwz.org>
+/* xscreensaver, Copyright (c) 2001-2014 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
@@ -76,6 +76,8 @@ minixpm_to_ximage (Display *dpy, Visual *visual, Colormap colormap, int depth,
 
   unsigned long *pixels;
   XImage *ximage = 0;
+  
+  memset (cmap, 0, sizeof(cmap)); /* avoid warnings */
 
   if (4 != sscanf ((const char *) *data,
                    "%d %d %d %d %c", &w, &h, &ncolors, &nbytes, &c)) {
@@ -119,6 +121,16 @@ minixpm_to_ximage (Display *dpy, Visual *visual, Colormap colormap, int depth,
               r = g = b = -1;
               line += 4;
             }
+          else if (!strncasecmp(line, "white", 5))
+            {
+              r = g = b = 255;
+              line += 5;
+            }
+          else if (!strncasecmp(line, "black", 5))
+            {
+              r = g = b = 0;
+              line += 5;
+            }
           else
             {
               if (*line != '#') {
@@ -188,17 +200,23 @@ minixpm_to_ximage (Display *dpy, Visual *visual, Colormap colormap, int depth,
   ximage = XCreateImage (dpy, visual, depth,
                          (depth == 1 ? XYBitmap : ZPixmap),
                          0, 0, w, h, 8, 0);
-  if (! ximage) return 0;
+  if (! ximage)
+    {
+      if (pixels) free (pixels);
+      return 0;
+    }
 
   ximage->bitmap_bit_order =
     ximage->byte_order =
     (bigendian() ? MSBFirst : LSBFirst);
 
   ximage->data = (char *) calloc (ximage->height, ximage->bytes_per_line);
-  if (!ximage->data) {
-    XDestroyImage (ximage);
-    return 0;
-  }
+  if (!ximage->data)
+    {
+      XDestroyImage (ximage);
+      if (pixels) free (pixels);
+      return 0;
+    }
 
   w8 = (w + 7) / 8;
   if (mask_ret)