--- a/src/glyphs-x.c	Mon Aug 13 11:01:58 2007 +0200
+++ b/src/glyphs-x.c	Mon Aug 13 11:03:08 2007 +0200
@@ -39,10 +39,8 @@
    Many changes for color work and optimizations by Jareth Hein for 21.0
    Switch of GIF/JPEG/PNG to new EImage intermediate code by Jareth Hein for 21.0
    TIFF code by Jareth Hein for 21.0
-   GIF/JPEG/PNG/TIFF code moved to new glyph-eimage.c for 21.0
 
    TODO:
-   Support the GrayScale, StaticColor and StaticGray visual classes.
    Convert images.el to C and stick it in here?
  */
 
@@ -134,13 +132,6 @@
   vis = DEVICE_X_VISUAL (XDEVICE(device));
   depth = DEVICE_X_DEPTH(XDEVICE(device));
 
-  if (vis->class == GrayScale || vis->class == StaticColor ||
-      vis->class == StaticGray)
-    {
-      /* #### Implement me!!! */
-      return NULL;
-    }
-
   if (vis->class == PseudoColor)
     {
       /* Quantize the image and get a histogram while we're at it.
@@ -152,14 +143,13 @@
   bitmap_pad = ((depth > 16) ? 32 :
 		(depth >  8) ? 16 :
 		8);
+  byte_cnt = bitmap_pad >> 3;
   
   outimg = XCreateImage (dpy, vis,
 			 depth, ZPixmap, 0, 0, width, height,
 			 bitmap_pad, 0);
   if (!outimg) return NULL;
 
-  byte_cnt = outimg->bits_per_pixel >> 3;
-
   data = (unsigned char *) xmalloc (outimg->bytes_per_line * height);
   if (!data)
     {