Load cups into easysw/current.

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

diff --git a/filter/image-tiff.c b/filter/image-tiff.c
index 7a61e728459e8cfcfd19da6d1a248516e3e10889..184cf96217dec18947379a35329c75cadbdcd2da 100644 (file)
--- a/filter/image-tiff.c
+++ b/filter/image-tiff.c
@@ -1,9 +1,9 @@
 /*
- * "$Id: image-tiff.c 4741 2005-10-02 04:25:52Z mike $"
+ * "$Id: image-tiff.c 5508 2006-05-11 11:41:16Z mike $"
  *
  *   TIFF file 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
@@ -783,39 +783,32 @@ _cupsImageReadTIFF(
              }
             }
 
-            if (img->colorspace == CUPS_IMAGE_RGB)
+           switch (img->colorspace)
            {
-             if (lut)
-               cupsImageLut(in, img->xsize * 3, lut);
-
-              _cupsImagePutRow(img, 0, y, img->xsize, in);
+             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;
            }
-            else
-            {
-             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;
-             }
 
-             if (lut)
-               cupsImageLut(out, img->xsize * bpp, lut);
+           if (lut)
+             cupsImageLut(out, img->xsize * bpp, lut);
 
-              _cupsImagePutRow(img, 0, y, img->xsize, out);
-           }
+            _cupsImagePutRow(img, 0, y, img->xsize, out);
           }
         }
         else
@@ -923,40 +916,33 @@ _cupsImageReadTIFF(
              }
             }
 
-            if (img->colorspace == CUPS_IMAGE_RGB)
+           switch (img->colorspace)
            {
-             if (lut)
-               cupsImageLut(in, img->ysize * 3, lut);
-
-              _cupsImagePutCol(img, x, 0, img->ysize, in);
+             default :
+                 break;
+
+             case CUPS_IMAGE_WHITE :
+                 cupsImageRGBToWhite(in, out, img->ysize);
+                 break;
+             case CUPS_IMAGE_RGB :
+                 cupsImageRGBToRGB(in, out, img->ysize);
+                 break;
+             case CUPS_IMAGE_BLACK :
+                 cupsImageRGBToBlack(in, out, img->ysize);
+                 break;
+             case CUPS_IMAGE_CMY :
+                 cupsImageRGBToCMY(in, out, img->ysize);
+                 break;
+             case CUPS_IMAGE_CMYK :
+                 cupsImageRGBToCMYK(in, out, img->ysize);
+                 break;
            }
-            else
-            {
-             switch (img->colorspace)
-             {
-               default :
-                   break;
-
-               case CUPS_IMAGE_WHITE :
-                   cupsImageRGBToWhite(in, out, img->ysize);
-                   break;
-               case CUPS_IMAGE_BLACK :
-                   cupsImageRGBToBlack(in, out, img->ysize);
-                   break;
-               case CUPS_IMAGE_CMY :
-                   cupsImageRGBToCMY(in, out, img->ysize);
-                   break;
-               case CUPS_IMAGE_CMYK :
-                   cupsImageRGBToCMYK(in, out, img->ysize);
-                   break;
-             }
 
-             if (lut)
-               cupsImageLut(out, img->ysize * bpp, lut);
+           if (lut)
+             cupsImageLut(out, img->ysize * bpp, lut);
 
-              _cupsImagePutCol(img, x, 0, img->ysize, out);
-           }
-          }
+            _cupsImagePutCol(img, x, 0, img->ysize, out);
+         }
         }
         break;
 
@@ -1074,39 +1060,32 @@ _cupsImageReadTIFF(
             if ((saturation != 100 || hue != 0) && bpp > 1)
               cupsImageRGBAdjust(in, img->xsize, saturation, hue);
 
-            if (img->colorspace == CUPS_IMAGE_RGB)
+           switch (img->colorspace)
            {
-             if (lut)
-               cupsImageLut(in, img->xsize * 3, lut);
-
-              _cupsImagePutRow(img, 0, y, img->xsize, in);
+             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;
            }
-            else
-            {
-             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;
-             }
 
-             if (lut)
-               cupsImageLut(out, img->xsize * bpp, lut);
+           if (lut)
+             cupsImageLut(out, img->xsize * bpp, lut);
 
-              _cupsImagePutRow(img, 0, y, img->xsize, out);
-           }
+            _cupsImagePutRow(img, 0, y, img->xsize, out);
           }
         }
         else
@@ -1222,39 +1201,32 @@ _cupsImageReadTIFF(
             if ((saturation != 100 || hue != 0) && bpp > 1)
               cupsImageRGBAdjust(in, img->ysize, saturation, hue);
 
-            if (img->colorspace == CUPS_IMAGE_RGB)
+           switch (img->colorspace)
            {
-             if (lut)
-               cupsImageLut(in, img->ysize * 3, lut);
-
-              _cupsImagePutCol(img, x, 0, img->ysize, in);
-            }
-           else
-            {
-             switch (img->colorspace)
-             {
-               default :
-                   break;
-
-               case CUPS_IMAGE_WHITE :
-                   cupsImageRGBToWhite(in, out, img->ysize);
-                   break;
-               case CUPS_IMAGE_BLACK :
-                   cupsImageRGBToBlack(in, out, img->ysize);
-                   break;
-               case CUPS_IMAGE_CMY :
-                   cupsImageRGBToCMY(in, out, img->ysize);
-                   break;
-               case CUPS_IMAGE_CMYK :
-                   cupsImageRGBToCMYK(in, out, img->ysize);
-                   break;
-             }
+             default :
+                 break;
+
+             case CUPS_IMAGE_WHITE :
+                 cupsImageRGBToWhite(in, out, img->ysize);
+                 break;
+             case CUPS_IMAGE_RGB :
+                 cupsImageRGBToRGB(in, out, img->ysize);
+                 break;
+             case CUPS_IMAGE_BLACK :
+                 cupsImageRGBToBlack(in, out, img->ysize);
+                 break;
+             case CUPS_IMAGE_CMY :
+                 cupsImageRGBToCMY(in, out, img->ysize);
+                 break;
+             case CUPS_IMAGE_CMYK :
+                 cupsImageRGBToCMYK(in, out, img->ysize);
+                 break;
+           }
 
-             if (lut)
-               cupsImageLut(out, img->ysize * bpp, lut);
+           if (lut)
+             cupsImageLut(out, img->ysize * bpp, lut);
 
-              _cupsImagePutCol(img, x, 0, img->ysize, out);
-           }
+            _cupsImagePutCol(img, x, 0, img->ysize, out);
           }
         }
         break;
@@ -1469,39 +1441,32 @@ _cupsImageReadTIFF(
               if ((saturation != 100 || hue != 0) && bpp > 1)
                cupsImageRGBAdjust(in, img->xsize, saturation, hue);
 
-              if (img->colorspace == CUPS_IMAGE_RGB)
+             switch (img->colorspace)
              {
-               if (lut)
-                 cupsImageLut(in, img->xsize * 3, lut);
+               default :
+                   break;
 
-               _cupsImagePutRow(img, 0, y, img->xsize, in);
+               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;
              }
-              else if (img->colorspace == CUPS_IMAGE_WHITE)
-              {
-               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;
-               }
 
-               if (lut)
-                 cupsImageLut(out, img->xsize * 3, lut);
+             if (lut)
+               cupsImageLut(out, img->xsize * 3, lut);
 
-               _cupsImagePutRow(img, 0, y, img->xsize, out);
-             }
+              _cupsImagePutRow(img, 0, y, img->xsize, out);
             }
           }
           else
@@ -1698,39 +1663,32 @@ _cupsImageReadTIFF(
               if ((saturation != 100 || hue != 0) && bpp > 1)
                cupsImageRGBAdjust(in, img->ysize, saturation, hue);
 
-              if (img->colorspace == CUPS_IMAGE_RGB)
+             switch (img->colorspace)
              {
-               if (lut)
-                 cupsImageLut(in, img->ysize * 3, lut);
+               default :
+                   break;
 
-               _cupsImagePutCol(img, x, 0, img->ysize, in);
-              }
-              else if (img->colorspace == CUPS_IMAGE_WHITE)
-              {
-               switch (img->colorspace)
-               {
-                 default :
-                     break;
-
-                 case CUPS_IMAGE_WHITE :
-                     cupsImageRGBToWhite(in, out, img->ysize);
-                     break;
-                 case CUPS_IMAGE_BLACK :
-                     cupsImageRGBToBlack(in, out, img->ysize);
-                     break;
-                 case CUPS_IMAGE_CMY :
-                     cupsImageRGBToCMY(in, out, img->ysize);
-                     break;
-                 case CUPS_IMAGE_CMYK :
-                     cupsImageRGBToCMYK(in, out, img->ysize);
-                     break;
-               }
+               case CUPS_IMAGE_WHITE :
+                   cupsImageRGBToWhite(in, out, img->ysize);
+                   break;
+               case CUPS_IMAGE_RGB :
+                   cupsImageRGBToRGB(in, out, img->ysize);
+                   break;
+               case CUPS_IMAGE_BLACK :
+                   cupsImageRGBToBlack(in, out, img->ysize);
+                   break;
+               case CUPS_IMAGE_CMY :
+                   cupsImageRGBToCMY(in, out, img->ysize);
+                   break;
+               case CUPS_IMAGE_CMYK :
+                   cupsImageRGBToCMYK(in, out, img->ysize);
+                   break;
+             }
 
-               if (lut)
-                 cupsImageLut(out, img->ysize * bpp, lut);
+             if (lut)
+               cupsImageLut(out, img->ysize * bpp, lut);
 
-               _cupsImagePutCol(img, x, 0, img->ysize, out);
-             }
+              _cupsImagePutCol(img, x, 0, img->ysize, out);
             }
           }
 
@@ -1762,5 +1720,5 @@ _cupsImageReadTIFF(
 
 
 /*
- * End of "$Id: image-tiff.c 4741 2005-10-02 04:25:52Z mike $".
+ * End of "$Id: image-tiff.c 5508 2006-05-11 11:41:16Z mike $".
  */