(no commit message)

diff --git a/coders/dpx.c b/coders/dpx.c
index 5d0e5249d7ac669f7b97be43100707b96437c2c0..c2f6e269d2074d9f52c6c9a9ad2728debdb73a4e 100644 (file)
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -1803,7 +1803,8 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image)
     }
   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;

diff --git a/coders/miff.c b/coders/miff.c
index f4d03233606a9596ca5f7416e4aa6609ce507139..ff7cdb0bb4bcb47d07ecd64dfd6edea94dddbffd 100644 (file)
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -1955,7 +1955,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
       "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));

diff --git a/coders/mpc.c b/coders/mpc.c
index 4b0acce95716a07ea3ef992f507d87035c518221..fb3c902f09b4b8d5ea8ba45788f1e53befaab2f0 100644 (file)
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -1088,7 +1088,7 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image)
       "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));

diff --git a/coders/png.c b/coders/png.c
index 2d4b89ddc6e76bca3e245e8e1e12d1d83f0b2ade..61d3cd18b5891474539d423e282cc4d9ede7bd46 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -7623,7 +7623,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
               image_matte=MagickTrue;
             }
 
-          if (image_info->type == UndefinedType ||
+          if (image_info->type == UndefinedColorType ||
              image_info->type == OptimizeType)
             {
 

diff --git a/coders/pnm.c b/coders/pnm.c
index 4266dca130eba987a20c586667f1d32be83cd3cf..fc6966678571b28ee21a1f37da6eb7d29b5678ee 100644 (file)
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -895,10 +895,10 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
               {
                 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 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception)
         quantum_info=DestroyQuantumInfo(quantum_info);
         if (status == MagickFalse)
           ThrowReaderException(CorruptImageError,"UnableToReadImageData");
-        if (type != UndefinedType)
+        if (type != UndefinedColorType)
           image->type=type;
         break;
       }

diff --git a/coders/tiff.c b/coders/tiff.c
index 2271695c77e4cfd0eb77d5802114366f6df5739c..a7a010924f190f558781e3d2f793fb6d6edd4693 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -2509,7 +2509,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info,
     /*
       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);

diff --git a/magick/attribute.c b/magick/attribute.c
index 6f1f9e4fdae308b0965b12ad311b50ffe961d5b4..04713e6f2495bd47affae4e37c59b2a693f8f961 100644 (file)
--- a/magick/attribute.c
+++ b/magick/attribute.c
@@ -621,18 +621,18 @@ MagickExport MagickBooleanType IsGrayImage(const Image *image,
     {
       if (IsGrayPixel(p) == MagickFalse)
         {
-          type=UndefinedType;
+          type=UndefinedColorType;
           break;
         }
       if ((type == BilevelType) && (IsMonochromePixel(p) == MagickFalse))
         type=GrayscaleType;
       p++;
     }
-    if (type == UndefinedType)
+    if (type == UndefinedColorType)
       break;
   }
   image_view=DestroyCacheView(image_view);
-  if (type == UndefinedType)
+  if (type == UndefinedColorType)
     return(MagickFalse);
   ((Image *) image)->type=type;
   if ((type == GrayscaleType) && (image->matte != MagickFalse))
@@ -704,16 +704,16 @@ MagickExport MagickBooleanType IsMonochromeImage(const Image *image,
     {
       if (IsMonochromePixel(p) == MagickFalse)
         {
-          type=UndefinedType;
+          type=UndefinedColorType;
           break;
         }
       p++;
     }
-    if (type == UndefinedType)
+    if (type == UndefinedColorType)
       break;
   }
   image_view=DestroyCacheView(image_view);
-  if (type == UndefinedType)
+  if (type == UndefinedColorType)
     return(MagickFalse);
   ((Image *) image)->type=type;
   return(MagickTrue);

diff --git a/magick/cache.c b/magick/cache.c
index 028004b660e867dac619427505ed4b60e17e883b..7d91f1f6fbfa40d9e261c18c895a95870be4c4e0 100644 (file)
--- a/magick/cache.c
+++ b/magick/cache.c
@@ -2143,7 +2143,7 @@ static Cache GetImagePixelCache(Image *image,const MagickBooleanType clone,
         Ensure the image matches the pixel cache morphology.
       */
       image->taint=MagickTrue;
-      image->type=UndefinedType;
+      image->type=UndefinedColorType;
       if (image->colorspace == GRAYColorspace)
         image->colorspace=RGBColorspace;
       if (ValidatePixelCacheMorphology(image) == MagickFalse)

diff --git a/magick/identify.c b/magick/identify.c
index f2561d091288bd038debf7b127b64241fa906a5a..e3d03bbc99c96d2de9a123b794757b062460d66d 100644 (file)
--- a/magick/identify.c
+++ b/magick/identify.c
@@ -336,7 +336,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
           image->page.width,(double) image->page.height,(double) image->page.x,
           (double) image->page.y);
       (void) fprintf(file,"%.20g-bit ",(double) image->depth);
-      if (image->type != UndefinedType)
+      if (image->type != UndefinedColorType)
         (void) fprintf(file,"%s ",MagickOptionToMnemonic(MagickTypeOptions,
           (ssize_t) image->type));
       if (image->storage_class == DirectClass)
@@ -418,7 +418,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
     MagickResolutionOptions,(ssize_t) image->units));
   (void) fprintf(file,"  Type: %s\n",MagickOptionToMnemonic(MagickTypeOptions,
     (ssize_t) type));
-  if (image->type != UndefinedType)
+  if (image->type != UndefinedColorType)
     (void) fprintf(file,"  Base type: %s\n",MagickOptionToMnemonic(
       MagickTypeOptions,(ssize_t) image->type));
   (void) fprintf(file,"  Endianess: %s\n",MagickOptionToMnemonic(

diff --git a/magick/image.c b/magick/image.c
index 669f63c79d06c759b1ca0693eab268096d1347b4..635d775d873d2599829decbda466ecaffc72279b 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -3741,7 +3741,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type)
       break;
     }
     case OptimizeType:
-    case UndefinedType:
+    case UndefinedColorType:
       break;
   }
   image->type=type;

diff --git a/magick/image.h b/magick/image.h
index 9444ec2bb36d56353c722b3dee8e3fa1eab28d7f..e43f00088affb558b0038bf1d35185b03ed50564 100644 (file)
--- a/magick/image.h
+++ b/magick/image.h
@@ -44,7 +44,8 @@ typedef enum
 
 typedef enum
 {
-  UndefinedType,
+  UndefinedType = 0,  /* deprecated */
+  UndefinedColorType = 0,
   BilevelType,
   GrayscaleType,
   GrayscaleMatteType,

diff --git a/magick/option.c b/magick/option.c
index e9f60f527dfc909c8c8b7d6445cd6eaff3fdb828..32e6efc41a48bc4b2b72f59746a6c4bffd6cf93f 100644 (file)
--- a/magick/option.c
+++ b/magick/option.c
@@ -1473,7 +1473,7 @@ static const OptionInfo
   },
   TypeOptions[] =
   {
-    { "Undefined", (ssize_t) UndefinedType, MagickTrue },
+    { "Undefined", (ssize_t) UndefinedColorType, MagickTrue },
     { "Bilevel", (ssize_t) BilevelType, MagickFalse },
     { "ColorSeparation", (ssize_t) ColorSeparationType, MagickFalse },
     { "ColorSeparationMatte", (ssize_t) ColorSeparationMatteType, MagickFalse },
@@ -1485,7 +1485,7 @@ static const OptionInfo
     { "PaletteMatte", (ssize_t) PaletteMatteType, MagickFalse },
     { "TrueColorMatte", (ssize_t) TrueColorMatteType, MagickFalse },
     { "TrueColor", (ssize_t) TrueColorType, MagickFalse },
-    { (char *) NULL, (ssize_t) UndefinedType, MagickFalse }
+    { (char *) NULL, (ssize_t) UndefinedColorType, MagickFalse }
   },
   ValidateOptions[] =
   {

diff --git a/tests/validate.c b/tests/validate.c
index d2e02ccc77d9d91f771338dd34a316757d9b6e78..8541c86f94739a5336fd63a60d039d1f19116ad5 100644 (file)
--- a/tests/validate.c
+++ b/tests/validate.c
@@ -484,7 +484,7 @@ static size_t ValidateImageFormatsInMemory(ImageInfo *image_info,
         (magick_info->decoder == (DecodeImageHandler *) NULL) ||
         (magick_info->encoder == (EncodeImageHandler *) NULL))
       continue;
-    for (j=0; reference_types[j].type != UndefinedType; j++)
+    for (j=0; reference_types[j].type != UndefinedColorType; j++)
     {
       /*
         Generate reference image.
@@ -695,7 +695,7 @@ static size_t ValidateImageFormatsOnDisk(ImageInfo *image_info,
         (magick_info->decoder == (DecodeImageHandler *) NULL) ||
         (magick_info->encoder == (EncodeImageHandler *) NULL))
       continue;
-    for (j=0; reference_types[j].type != UndefinedType; j++)
+    for (j=0; reference_types[j].type != UndefinedColorType; j++)
     {
       /*
         Generate reference image.

diff --git a/tests/validate.h b/tests/validate.h
index f09f5d8fc611e948d56c6d3b94e693c20f931f7a..35a00fe1b48cab7f6bbef3f714c4a3486f6cc5d4 100644 (file)
--- a/tests/validate.h
+++ b/tests/validate.h
@@ -448,7 +448,7 @@ static const struct ReferenceTypes
     { TrueColorType, 10 },
     { TrueColorType, 12 },
     { TrueColorType, 16 },
-    { UndefinedType, 0 }
+    { UndefinedColorType, 0 }
   };
 
 #endif

diff --git a/wand/magick-image.c b/wand/magick-image.c
index 620a0762dd53675dc325208037558a0a05270f0b..9b741b0eb946837cf5a9d261a52b0b88c1175ee2 100644 (file)
--- a/wand/magick-image.c
+++ b/wand/magick-image.c
@@ -5953,7 +5953,7 @@ WandExport ImageType MagickGetImageType(MagickWand *wand)
     {
       (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError,
         "ContainsNoImages","`%s'",wand->name);
-      return(UndefinedType);
+      return(UndefinedColorType);
     }
   return(GetImageType(wand->images,wand->exception));
 }
@@ -10902,7 +10902,7 @@ WandExport MagickBooleanType MagickSetImageTicksPerSecond(MagickWand *wand,
 %
 %    o wand: the magick wand.
 %
-%    o image_type: the image type:   UndefinedType, BilevelType, GrayscaleType,
+%    o image_type: the image type:   UndefinedColorType, BilevelType, GrayscaleType,
 %      GrayscaleMatteType, PaletteType, PaletteMatteType, TrueColorType,
 %      TrueColorMatteType, ColorSeparationType, ColorSeparationMatteType,
 %      or OptimizeType.

diff --git a/wand/magick-property.c b/wand/magick-property.c
index 4bacb563517d9ec66deec214e7dbfb708f538c8e..9b5d6ba250c3ed8e1ec268b19bd44eeee7a95da9 100644 (file)
--- a/wand/magick-property.c
+++ b/wand/magick-property.c
@@ -2934,7 +2934,7 @@ WandExport MagickBooleanType MagickSetSizeOffset(MagickWand *wand,
 %
 %    o wand: the magick wand.
 %
-%    o image_type: the image type:   UndefinedType, BilevelType, GrayscaleType,
+%    o image_type: the image type:   UndefinedColorType, BilevelType, GrayscaleType,
 %      GrayscaleMatteType, PaletteType, PaletteMatteType, TrueColorType,
 %      TrueColorMatteType, ColorSeparationType, ColorSeparationMatteType,
 %      or OptimizeType.

diff --git a/wand/mogrify.c b/wand/mogrify.c
index f6a4e8367510f6e3e92e619328edc5dd8fba11a7..b96b412879a97ca9598f7bb8b4d32a27666508d3 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -3375,11 +3375,11 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
 
             (void) SyncImageSettings(mogrify_info,*image);
             if (*option == '+')
-              type=UndefinedType;
+              type=UndefinedColorType;
             else
               type=(ImageType) ParseMagickOption(MagickTypeOptions,MagickFalse,
                 argv[i+1]);
-            (*image)->type=UndefinedType;
+            (*image)->type=UndefinedColorType;
             (void) SetImageType(*image,type);
             InheritException(exception,&(*image)->exception);
             break;
@@ -7409,7 +7409,7 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
           {
             if (*option == '+')
               {
-                image_info->type=UndefinedType;
+                image_info->type=UndefinedColorType;
                 (void) SetImageOption(image_info,option+1,"undefined");
                 break;
               }