Load cups into easysw/current.

[thirdparty/cups.git] / filter / image-bmp.c

diff --git a/filter/image-bmp.c b/filter/image-bmp.c
index 9a20ec8c4e95c8d410d2ced2ed4601b914119575..1dc5247632590c7c8c52a87495fd350dc53ecef2 100644 (file)
--- a/filter/image-bmp.c
+++ b/filter/image-bmp.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: image-bmp.c 4741 2005-10-02 04:25:52Z mike $"
+ * "$Id: image-bmp.c 5508 2006-05-11 11:41:16Z mike $"
  *
  *   BMP image routines for the Common UNIX Printing System (CUPS).
  *
- *   Copyright 1993-2005 by Easy Software Products.
+ *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
  *   property of Easy Software Products and are protected by Federal
@@ -202,10 +202,7 @@ _cupsImageReadBMP(
 
   for (y = img->ysize - 1; y >= 0; y --)
   {
-    if (img->colorspace == CUPS_IMAGE_RGB)
-      ptr = out;
-    else
-      ptr = in;
+    ptr = in;
 
     switch (depth)
     {
@@ -442,37 +439,33 @@ _cupsImageReadBMP(
           break;
     }
 
-    if (img->colorspace == CUPS_IMAGE_RGB)
-    {
-      if (saturation != 100 || hue != 0)
-       cupsImageRGBAdjust(out, img->xsize, saturation, hue);
-    }
-    else
+    if (saturation != 100 || hue != 0)
+      cupsImageRGBAdjust(in, img->xsize, saturation, hue);
+
+    switch (img->colorspace)
     {
-      if (saturation != 100 || hue != 0)
-       cupsImageRGBAdjust(in, img->xsize, saturation, hue);
-
-      switch (img->colorspace)
-      {
-        default :
-           break;
-
-       case CUPS_IMAGE_WHITE :
-           cupsImageRGBToWhite(in, out, img->xsize);
-           break;
-
-       case CUPS_IMAGE_BLACK :
-           cupsImageRGBToBlack(in, out, img->xsize);
-           break;
-
-       case CUPS_IMAGE_CMY :
-           cupsImageRGBToCMY(in, out, img->xsize);
-           break;
-
-       case CUPS_IMAGE_CMYK :
-           cupsImageRGBToCMYK(in, out, img->xsize);
-           break;
-      }
+      default :
+         break;
+
+      case CUPS_IMAGE_WHITE :
+         cupsImageRGBToWhite(in, out, img->xsize);
+         break;
+
+      case CUPS_IMAGE_RGB :
+         cupsImageRGBToRGB(in, out, img->xsize);
+         break;
+
+      case CUPS_IMAGE_BLACK :
+         cupsImageRGBToBlack(in, out, img->xsize);
+         break;
+
+      case CUPS_IMAGE_CMY :
+         cupsImageRGBToCMY(in, out, img->xsize);
+         break;
+
+      case CUPS_IMAGE_CMYK :
+         cupsImageRGBToCMYK(in, out, img->xsize);
+         break;
     }
 
     if (lut)
@@ -542,5 +535,5 @@ read_long(FILE *fp)               /* I - File to read from */
 
 
 /*
- * End of "$Id: image-bmp.c 4741 2005-10-02 04:25:52Z mike $".
+ * End of "$Id: image-bmp.c 5508 2006-05-11 11:41:16Z mike $".
  */