X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utils%2Fminixpm.c;h=ae8f8265a6738e928f6ed07b938ca343ce63eb0b;hb=d1ae2829ff0fd2a96c16a0c8c5420efaa47d7b30;hp=8fe3eac64a28a8c1efbe89e7bb23f2e3384f2eb9;hpb=4ade52359b6eba3621566dac79793a33aa4c915f;p=xscreensaver

diff --git a/utils/minixpm.c b/utils/minixpm.c
index 8fe3eac6..ae8f8265 100644
--- a/utils/minixpm.c
+++ b/utils/minixpm.c
@@ -1,4 +1,4 @@
-/* xscreensaver, Copyright (c) 2001-2013 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
@@ -28,12 +28,12 @@
 #include <stdio.h>
 #include <string.h>
 
-#ifdef HAVE_COCOA
+#if defined (HAVE_COCOA) || defined(HAVE_ANDROID)
 # include "jwxyz.h"
-#else  /* !HAVE_COCOA - real Xlib */
+#else  /* real Xlib */
 # include <X11/Xlib.h>
 # include <X11/Xutil.h>
-#endif /* !HAVE_COCOA */
+#endif /* !HAVE_COCOA && !HAVE_ANDROID */
 
 #include "minixpm.h"
 
@@ -121,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 != '#') {