rnd-20020320-1-src

[rocksndiamonds.git] / src / libgame / image.c

diff --git a/src/libgame/image.c b/src/libgame/image.c
index ae53b44a3b8b2d909b610adf2ef0176655d4db5d..ef2898e25b258478bca80bf61a6f595480931d8e 100644 (file)
--- a/src/libgame/image.c
+++ b/src/libgame/image.c
@@ -23,30 +23,31 @@
 Image *newImage(unsigned int width, unsigned int height, unsigned int depth)
 {
   Image *image;
-  const unsigned int bytes_per_pixel = 1;
+  unsigned int bytes_per_pixel = (depth + 7) / 8;
   int i;
 
+#if 0
   if (depth > 8)
     Error(ERR_EXIT, "images with more than 256 colors are not supported");
 
   depth = 8;
+#endif
 
   image = checked_malloc(sizeof(Image));
   image->data = checked_malloc(width * height * bytes_per_pixel);
   image->width = width;
   image->height = height;
   image->depth = depth;
-  image->rgb.used = 0;
+  image->bytes_per_pixel = bytes_per_pixel;
+  image->bytes_per_row = width * bytes_per_pixel;
 
+  image->rgb.used = 0;
   for (i=0; i<MAX_COLORS; i++)
     image->rgb.color_used[i] = FALSE;
 
   image->type = (depth < 8 ? IMAGETYPE_BITMAP :
                 depth > 8 ? IMAGETYPE_TRUECOLOR : IMAGETYPE_RGB);
 
-  image->bytes_per_row = (depth + 7) / 8;
-  image->bytes_per_row *= width;
-
   return image;
 }
 
@@ -93,7 +94,7 @@ static Pixmap Image_to_Mask(Image *image, Display *display, Window window)
 {
   byte *src_ptr, *dst_ptr, *dst_ptr2;
   unsigned int bytes_per_row;
-  unsigned int x, y;
+  unsigned int x, y, i;
   byte bitmask;
   byte *mask_data;
   Pixmap mask_pixmap;
@@ -116,8 +117,9 @@ static Pixmap Image_to_Mask(Image *image, Display *display, Window window)
 
     for (x=0; x<image->width; x++)
     {
-      if (*src_ptr++)          /* source pixel solid? (pixel index != 0)  */
-       *dst_ptr2 |= bitmask;   /* then write a bit into the image mask    */
+      for (i=0; i<image->bytes_per_pixel; i++)
+       if (*src_ptr++)         /* source pixel solid? (pixel index != 0)  */
+         *dst_ptr2 |= bitmask; /* then write a bit into the image mask    */
 
       if ((bitmask <<= 1) == 0)        /* bit at rightmost byte position reached? */
       {
@@ -167,12 +169,16 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
   static int num_cmap_entries, free_cmap_entries;
   static boolean private_cmap = FALSE;
   Pixel *redvalue, *greenvalue, *bluevalue;
-  unsigned int a, c = 0, x, y, bytes_per_pixel, bits_per_pixel;
+  unsigned int display_bytes_per_pixel, display_bits_per_pixel;
+  unsigned int a, c = 0, x, y;
   XColor xcolor;
   XImage *ximage;
   XImageInfo *ximageinfo;
   byte *src_ptr, *dst_ptr;
 
+  if (image->type == IMAGETYPE_TRUECOLOR && depth == 8)
+    Error(ERR_EXIT, "cannot handle true-color images on 8-bit display");
+
   if (!global_cmap)
   {
     if (visual == DefaultVisual(display, screen))
@@ -417,14 +423,14 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
 
   /* create XImage from internal image structure and convert it to Pixmap */
 
-  bits_per_pixel = bitsPerPixelAtDepth(display, screen, depth);
-  bytes_per_pixel = (bits_per_pixel + 7) / 8;
+  display_bits_per_pixel = bitsPerPixelAtDepth(display, screen, depth);
+  display_bytes_per_pixel = (display_bits_per_pixel + 7) / 8;
 
   ximage = XCreateImage(display, visual, depth, ZPixmap, 0,
                        NULL, image->width, image->height,
-                       8, image->width * bytes_per_pixel);
+                       8, image->width * display_bytes_per_pixel);
   ximage->data =
-    checked_malloc(image->width * image->height * bytes_per_pixel);
+    checked_malloc(image->width * image->height * display_bytes_per_pixel);
   ximage->byte_order = MSBFirst;
 
   src_ptr = image->data;
@@ -450,8 +456,8 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
                redvalue[image->rgb.red[pixval] >> 8] |
                greenvalue[image->rgb.green[pixval] >> 8] |
                bluevalue[image->rgb.blue[pixval] >> 8];
-             value_to_memory(pixval, dst_ptr, bytes_per_pixel);
-             dst_ptr += bytes_per_pixel;
+             value_to_memory(pixval, dst_ptr, display_bytes_per_pixel);
+             dst_ptr += display_bytes_per_pixel;
            }
          }
          break;
@@ -463,14 +469,14 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
          {
            for (x=0; x<image->width; x++)
            {
-             pixval = memory_to_value(src_ptr, image->depth);
+             pixval = memory_to_value(src_ptr, image->bytes_per_pixel);
              pixval =
                redvalue[TRUECOLOR_RED(pixval)] |
                greenvalue[TRUECOLOR_GREEN(pixval)] |
                bluevalue[TRUECOLOR_BLUE(pixval)];
-             value_to_memory(pixval, dst_ptr, bytes_per_pixel);
-             src_ptr += image->depth;
-             dst_ptr += bytes_per_pixel;
+             value_to_memory(pixval, dst_ptr, display_bytes_per_pixel);
+             src_ptr += image->bytes_per_pixel;
+             dst_ptr += display_bytes_per_pixel;
            }
          }
          break;
@@ -486,7 +492,7 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
 
     case PseudoColor:
     {
-      if (bytes_per_pixel == 1)                        /* (common) special case */
+      if (display_bytes_per_pixel == 1)                /* special case */
       {
        for (y=0; y<image->height; y++)
          for (x=0; x<image->width; x++)
@@ -499,8 +505,8 @@ XImageInfo *Image_to_Pixmap(Display *display, int screen, Visual *visual,
          for (x=0; x<image->width; x++)
          {
            value_to_memory(ximageinfo->index[c + *src_ptr++],
-                           dst_ptr, bytes_per_pixel);
-           dst_ptr += bytes_per_pixel;
+                           dst_ptr, display_bytes_per_pixel);
+           dst_ptr += display_bytes_per_pixel;
          }
        }
       }