From c8e4cd490213458d3d46936939a661ea48a91fe3 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 23 Dec 2010 21:36:08 +0000 Subject: [PATCH] --- coders/dpx.c | 3 ++- coders/miff.c | 2 +- coders/mpc.c | 2 +- coders/png.c | 2 +- coders/pnm.c | 6 +++--- coders/tiff.c | 2 +- magick/attribute.c | 12 ++++++------ magick/cache.c | 2 +- magick/identify.c | 4 ++-- magick/image.c | 2 +- magick/image.h | 3 ++- magick/option.c | 4 ++-- tests/validate.c | 4 ++-- tests/validate.h | 2 +- wand/magick-image.c | 4 ++-- wand/magick-property.c | 2 +- wand/mogrify.c | 6 +++--- 17 files changed, 32 insertions(+), 30 deletions(-) diff --git a/coders/dpx.c b/coders/dpx.c index 5d0e5249d..c2f6e269d 100644 --- 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 f4d032336..ff7cdb0bb 100644 --- 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 4b0acce95..fb3c902f0 100644 --- 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 2d4b89ddc..61d3cd18b 100644 --- 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 4266dca13..fc6966678 100644 --- 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 2271695c7..a7a010924 100644 --- 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 6f1f9e4fd..04713e6f2 100644 --- 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 028004b66..7d91f1f6f 100644 --- 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 f2561d091..e3d03bbc9 100644 --- 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 669f63c79..635d775d8 100644 --- 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 9444ec2bb..e43f00088 100644 --- 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 e9f60f527..32e6efc41 100644 --- 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 d2e02ccc7..8541c86f9 100644 --- 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 f09f5d8fc..35a00fe1b 100644 --- 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 620a0762d..9b741b0eb 100644 --- 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 4bacb5635..9b5d6ba25 100644 --- 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 f6a4e8367..b96b41287 100644 --- 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; } -- 2.40.0