commit c8e4cd490213458d3d46936939a661ea48a91fe3
author cristy <urban-warrior@git.imagemagick.org> Thu Dec 23 21:36:08 2010 +0000
committer cristy <urban-warrior@git.imagemagick.org> Thu Dec 23 21:36:08 2010 +0000
tree ff820cdea5e2d1343f532712a10260edc6c82074
parent 0effd18fbf53464c03c58fe4ecf99b08e85f3db9

coders/dpx.c

diff --git a/coders/dpx.c b/coders/dpx.c
index 5d0e524..c2f6e26 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -1803,7 +1803,8 @@
     }
   extent=GetBytesPerRow(image->columns,image->matte != MagickFalse ? 4UL : 3UL,
     image->depth,MagickTrue);
-  if ((image_info->type != TrueColorType) && (image->matte == MagickFalse) &&
+  if ((image_info->type != UndefinedColorType) &&
+      (image_info->type != TrueColorType) && (image->matte == MagickFalse) &&
       (IsGrayImage(image,&image->exception) != MagickFalse))
     {
       quantum_type=GrayQuantum;

coders/miff.c

diff --git a/coders/miff.c b/coders/miff.c
index f4d0323..ff7cdb0 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -1955,7 +1955,7 @@
       "depth=%.20g\n",(double) image->columns,(double) image->rows,(double)
       image->depth);
     (void) WriteBlobString(image,buffer);
-    if (image->type != UndefinedType)
+    if (image->type != UndefinedColorType)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"type=%s\n",
           MagickOptionToMnemonic(MagickTypeOptions,image->type));

coders/mpc.c

diff --git a/coders/mpc.c b/coders/mpc.c
index 4b0acce..fb3c902 100644
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -1088,7 +1088,7 @@
       "columns=%.20g  rows=%.20g depth=%.20g\n",(double) image->columns,
       (double) image->rows,(double) image->depth);
     (void) WriteBlobString(image,buffer);
-    if (image->type != UndefinedType)
+    if (image->type != UndefinedColorType)
       {
         (void) FormatMagickString(buffer,MaxTextExtent,"type=%s\n",
           MagickOptionToMnemonic(MagickTypeOptions,image->type));

coders/png.c

diff --git a/coders/png.c b/coders/png.c
index 2d4b89d..61d3cd1 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -7623,7 +7623,7 @@
               image_matte=MagickTrue;
             }
 
-          if (image_info->type == UndefinedType ||
+          if (image_info->type == UndefinedColorType ||
              image_info->type == OptimizeType)
             {
 

coders/pnm.c

diff --git a/coders/pnm.c b/coders/pnm.c
index 4266dca..fc69666 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -895,10 +895,10 @@
               {
                 if ((type == BilevelType) &&
                     (IsMonochromePixel(q) == MagickFalse))
-                  type=IsGrayPixel(q) == MagickFalse ? UndefinedType :
+                  type=IsGrayPixel(q) == MagickFalse ? UndefinedColorType :
                     GrayscaleType;
                 if ((type == GrayscaleType) && (IsGrayPixel(q) == MagickFalse))
-                  type=UndefinedType;
+                  type=UndefinedColorType;
                 if ((type != BilevelType) && (type != GrayscaleType))
                   break;
                 q++;
@@ -911,7 +911,7 @@
         quantum_info=DestroyQuantumInfo(quantum_info);
         if (status == MagickFalse)
           ThrowReaderException(CorruptImageError,"UnableToReadImageData");
-        if (type != UndefinedType)
+        if (type != UndefinedColorType)
           image->type=type;
         break;
       }

coders/tiff.c

diff --git a/coders/tiff.c b/coders/tiff.c
index 2271695..a7a0109 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -2509,7 +2509,7 @@
     /*
       Initialize TIFF fields.
     */
-    if ((image_info->type != UndefinedType) &&
+    if ((image_info->type != UndefinedColorType) &&
         (image_info->type != OptimizeType))
       (void) SetImageType(image,image_info->type);
     quantum_info=AcquireQuantumInfo(image_info,image);