From 8d95109eca7aee289423a1ee81c232e309b383ae Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 8 Feb 2012 18:54:56 +0000 Subject: [PATCH] --- MagickCore/colorspace-private.h | 2 +- MagickCore/image.c | 16 ++++++++-------- MagickCore/nt-base.c | 4 ++-- MagickWand/operation.c | 2 ++ coders/aai.c | 2 +- coders/art.c | 2 +- coders/avs.c | 2 +- coders/bgr.c | 2 +- coders/bmp.c | 2 +- coders/cip.c | 2 +- coders/dib.c | 2 +- coders/fax.c | 2 +- coders/fits.c | 2 +- coders/fpx.c | 2 +- coders/gif.c | 3 +-- coders/gray.c | 2 +- coders/hdr.c | 2 +- coders/html.c | 2 +- coders/ipl.c | 2 +- coders/jbig.c | 2 +- coders/jp2.c | 2 +- coders/jpeg.c | 4 +--- coders/map.c | 2 +- coders/mat.c | 2 +- coders/mono.c | 2 +- coders/mtv.c | 2 +- coders/otb.c | 2 +- coders/palm.c | 2 +- coders/pcl.c | 2 +- coders/pcx.c | 2 +- coders/pdb.c | 4 ++-- coders/pdf.c | 2 +- coders/pict.c | 2 +- coders/png.c | 6 +----- coders/pnm.c | 2 +- coders/ps.c | 2 +- coders/psd.c | 2 +- coders/rgb.c | 2 +- coders/sgi.c | 2 +- coders/sun.c | 2 +- coders/tga.c | 2 +- coders/tiff.c | 2 +- coders/uil.c | 2 +- coders/vicar.c | 2 +- coders/viff.c | 2 +- coders/wbmp.c | 2 +- coders/xbm.c | 2 +- coders/xpm.c | 4 ++-- coders/xwd.c | 2 +- 49 files changed, 60 insertions(+), 65 deletions(-) diff --git a/MagickCore/colorspace-private.h b/MagickCore/colorspace-private.h index 39335b626..09b0cf4a4 100644 --- a/MagickCore/colorspace-private.h +++ b/MagickCore/colorspace-private.h @@ -71,7 +71,7 @@ static inline MagickBooleanType IsGrayColorspace( static inline MagickBooleanType IsRGBColorspace(const ColorspaceType colorspace) { if ((IsGrayColorspace(colorspace) != MagickFalse) || - (colorspace == RGBColorspace) || (colorspace == TransparentColorspace)) + (colorspace == sRGBColorspace) || (colorspace == TransparentColorspace)) return(MagickTrue); return(MagickFalse); } diff --git a/MagickCore/image.c b/MagickCore/image.c index 1d89dfd79..59dc79115 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -172,7 +172,7 @@ MagickExport Image *AcquireImage(const ImageInfo *image_info, (void) CopyMagickString(image->magick,"MIFF",MaxTextExtent); image->storage_class=DirectClass; image->depth=MAGICKCORE_QUANTUM_DEPTH; - image->colorspace=RGBColorspace; + image->colorspace=sRGBColorspace; image->interlace=NoInterlace; image->ticks_per_second=UndefinedTicksPerSecond; image->compose=OverCompositeOp; @@ -3565,7 +3565,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, case PaletteType: { if (IsRGBColorspace(image->colorspace) == MagickFalse) - status=TransformImageColorspace(image,RGBColorspace,exception); + status=TransformImageColorspace(image,sRGBColorspace,exception); if ((image->storage_class == DirectClass) || (image->colors > 256)) { quantize_info=AcquireQuantizeInfo(image_info); @@ -3582,7 +3582,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, channel_mask; if (IsRGBColorspace(image->colorspace) == MagickFalse) - status=TransformImageColorspace(image,RGBColorspace,exception); + status=TransformImageColorspace(image,sRGBColorspace,exception); if (image->matte == MagickFalse) (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception); channel_mask=SetPixelChannelMask(image,AlphaChannel); @@ -3596,7 +3596,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, case PaletteMatteType: { if (IsRGBColorspace(image->colorspace) == MagickFalse) - status=TransformImageColorspace(image,RGBColorspace,exception); + status=TransformImageColorspace(image,sRGBColorspace,exception); if (image->matte == MagickFalse) (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception); quantize_info=AcquireQuantizeInfo(image_info); @@ -3608,7 +3608,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, case TrueColorType: { if (IsRGBColorspace(image->colorspace) == MagickFalse) - status=TransformImageColorspace(image,RGBColorspace,exception); + status=TransformImageColorspace(image,sRGBColorspace,exception); if (image->storage_class != DirectClass) status=SetImageStorageClass(image,DirectClass,exception); image->matte=MagickFalse; @@ -3617,7 +3617,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, case TrueColorMatteType: { if (IsRGBColorspace(image->colorspace) == MagickFalse) - status=TransformImageColorspace(image,RGBColorspace,exception); + status=TransformImageColorspace(image,sRGBColorspace,exception); if (image->storage_class != DirectClass) status=SetImageStorageClass(image,DirectClass,exception); if (image->matte == MagickFalse) @@ -3629,7 +3629,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, if (image->colorspace != CMYKColorspace) { if (IsRGBColorspace(image->colorspace) == MagickFalse) - status=TransformImageColorspace(image,RGBColorspace,exception); + status=TransformImageColorspace(image,sRGBColorspace,exception); status=TransformImageColorspace(image,CMYKColorspace,exception); } if (image->storage_class != DirectClass) @@ -3642,7 +3642,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type, if (image->colorspace != CMYKColorspace) { if (IsRGBColorspace(image->colorspace) == MagickFalse) - status=TransformImageColorspace(image,RGBColorspace,exception); + status=TransformImageColorspace(image,sRGBColorspace,exception); status=TransformImageColorspace(image,CMYKColorspace,exception); } if (image->storage_class != DirectClass) diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c index 6299beec3..63c0fbf5b 100644 --- a/MagickCore/nt-base.c +++ b/MagickCore/nt-base.c @@ -216,7 +216,7 @@ MagickExport void *CropImageToHBITMAP(Image *image, if ( bitmap.bmBits == NULL ) bitmap.bmBits = bitmap_bits; if (IsRGBColorspace(image->colorspace) == MagickFalse) - TransformImageColorspace(image,RGBColorspace,exception); + TransformImageColorspace(image,sRGBColorspace,exception); /* Extract crop image. */ @@ -560,7 +560,7 @@ MagickExport void *ImageToHBITMAP(Image *image,ExceptionInfo *exception) q=bitmap_bits; if (bitmap.bmBits == NULL) bitmap.bmBits=bitmap_bits; - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); for (y=0; y < (ssize_t) image->rows; y++) { p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/MagickWand/operation.c b/MagickWand/operation.c index c4596d615..e084f9768 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -54,6 +54,7 @@ #include "MagickCore/monitor-private.h" #include "MagickCore/thread-private.h" #include "MagickCore/string-private.h" +#if 0 /* Define declarations. @@ -4056,3 +4057,4 @@ WandExport void WandListOperatorImages(MagickWand *wand,const char *option, #undef exception #undef normal_op } +#endif diff --git a/coders/aai.c b/coders/aai.c index 9a6f6a850..e61387b64 100644 --- a/coders/aai.c +++ b/coders/aai.c @@ -365,7 +365,7 @@ static MagickBooleanType WriteAAIImage(const ImageInfo *image_info,Image *image, Write AAI header. */ if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); (void) WriteBlobLSBLong(image,(unsigned int) image->columns); (void) WriteBlobLSBLong(image,(unsigned int) image->rows); /* diff --git a/coders/art.c b/coders/art.c index 3dbc9afd9..eafb1290f 100644 --- a/coders/art.c +++ b/coders/art.c @@ -309,7 +309,7 @@ static MagickBooleanType WriteARTImage(const ImageInfo *image_info,Image *image, if ((image->columns > 65535UL) || (image->rows > 65535UL)) ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit"); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); (void) SetImageType(image,BilevelType,exception); image->endian=MSBEndian; image->depth=1; diff --git a/coders/avs.c b/coders/avs.c index 37644f7a1..76a03c9e6 100644 --- a/coders/avs.c +++ b/coders/avs.c @@ -361,7 +361,7 @@ static MagickBooleanType WriteAVSImage(const ImageInfo *image_info,Image *image, Write AVS header. */ if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); (void) WriteBlobMSBLong(image,(unsigned int) image->columns); (void) WriteBlobMSBLong(image,(unsigned int) image->rows); /* diff --git a/coders/bgr.c b/coders/bgr.c index 40c70b969..69e75d067 100644 --- a/coders/bgr.c +++ b/coders/bgr.c @@ -1108,7 +1108,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, Convert MIFF to BGR raster pixels. */ if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); if ((LocaleCompare(image_info->magick,"BGRA") == 0) && (image->matte == MagickFalse)) (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception); diff --git a/coders/bmp.c b/coders/bmp.c index 82a9b2c3f..e9b20325d 100644 --- a/coders/bmp.c +++ b/coders/bmp.c @@ -1528,7 +1528,7 @@ static MagickBooleanType WriteBMPImage(const ImageInfo *image_info,Image *image, Initialize BMP raster file header. */ if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); (void) ResetMagickMemory(&bmp_info,0,sizeof(bmp_info)); bmp_info.file_size=14+12; if (type > 2) diff --git a/coders/cip.c b/coders/cip.c index cfcfb9174..75a47c511 100644 --- a/coders/cip.c +++ b/coders/cip.c @@ -236,7 +236,7 @@ static MagickBooleanType WriteCIPImage(const ImageInfo *image_info,Image *image, (void) WriteBlobString(image,buffer); (void) WriteBlobString(image,""); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); for (y=0; y < (ssize_t) image->rows; y++) { p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/dib.c b/coders/dib.c index 085215e9b..47307ba07 100644 --- a/coders/dib.c +++ b/coders/dib.c @@ -1011,7 +1011,7 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image, Initialize DIB raster file header. */ if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); if (image->storage_class == DirectClass) { /* diff --git a/coders/fax.c b/coders/fax.c index 06de5e688..ecec8b129 100644 --- a/coders/fax.c +++ b/coders/fax.c @@ -331,7 +331,7 @@ static MagickBooleanType WriteFAXImage(const ImageInfo *image_info,Image *image, Convert MIFF to monochrome. */ if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); status=HuffmanEncodeImage(write_info,image,image,exception); if (GetNextImageInList(image) == (Image *) NULL) break; diff --git a/coders/fits.c b/coders/fits.c index e8bc7729b..47a0f1580 100644 --- a/coders/fits.c +++ b/coders/fits.c @@ -637,7 +637,7 @@ static MagickBooleanType WriteFITSImage(const ImageInfo *image_info, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); /* Allocate image memory. */ diff --git a/coders/fpx.c b/coders/fpx.c index c8a2ae0a4..030e6c024 100644 --- a/coders/fpx.c +++ b/coders/fpx.c @@ -859,7 +859,7 @@ static MagickBooleanType WriteFPXImage(const ImageInfo *image_info,Image *image, */ image->depth=8; if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); memory_limit=20000000; fpx_status=FPX_SetToolkitMemoryLimit(&memory_limit); if (fpx_status != FPX_OK) diff --git a/coders/gif.c b/coders/gif.c index 3a1fd7753..55977ec8a 100644 --- a/coders/gif.c +++ b/coders/gif.c @@ -1220,7 +1220,6 @@ static Image *ReadGIFImage(const ImageInfo *image_info,ExceptionInfo *exception) Read image attributes. */ image->storage_class=PseudoClass; - image->colorspace=sRGBColorspace; image->compression=LZWCompression; page.x=(ssize_t) ReadBlobLSBShort(image); page.y=(ssize_t) ReadBlobLSBShort(image); @@ -1564,7 +1563,7 @@ static MagickBooleanType WriteGIFImage(const ImageInfo *image_info,Image *image, do { if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); opacity=(-1); if (IsImageOpaque(image,exception) != MagickFalse) { diff --git a/coders/gray.c b/coders/gray.c index 5223098ef..5318ce69e 100644 --- a/coders/gray.c +++ b/coders/gray.c @@ -412,7 +412,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info, Write grayscale pixels. */ if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); quantum_type=GrayQuantum; quantum_info=AcquireQuantumInfo(image_info,image); if (quantum_info == (QuantumInfo *) NULL) diff --git a/coders/hdr.c b/coders/hdr.c index 0874622f0..8aa9ee058 100644 --- a/coders/hdr.c +++ b/coders/hdr.c @@ -687,7 +687,7 @@ static MagickBooleanType WriteHDRImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); /* Write header. */ diff --git a/coders/html.c b/coders/html.c index 648de6028..a49b765d8 100644 --- a/coders/html.c +++ b/coders/html.c @@ -251,7 +251,7 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, return(status); (void) CloseBlob(image); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); *url='\0'; if ((LocaleCompare(image_info->magick,"FTP") == 0) || (LocaleCompare(image_info->magick,"HTTP") == 0)) diff --git a/coders/ipl.c b/coders/ipl.c index 806cd0731..ca5b199d2 100644 --- a/coders/ipl.c +++ b/coders/ipl.c @@ -577,7 +577,7 @@ static MagickBooleanType WriteIPLImage(const ImageInfo *image_info,Image *image, ipl_info.height = (unsigned int) image->rows; if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); if(IsRGBColorspace(image->colorspace) == MagickTrue) { ipl_info.colors = 3; } else{ ipl_info.colors = 1; } diff --git a/coders/jbig.c b/coders/jbig.c index 8c1325171..8b5dce9d0 100644 --- a/coders/jbig.c +++ b/coders/jbig.c @@ -447,7 +447,7 @@ static MagickBooleanType WriteJBIGImage(const ImageInfo *image_info, Allocate pixel data. */ if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); number_packets=(image->columns+7)/8; pixels=(unsigned char *) AcquireQuantumMemory(number_packets, image->rows*sizeof(*pixels)); diff --git a/coders/jp2.c b/coders/jp2.c index 0c74b7a66..02f09ab5b 100644 --- a/coders/jp2.c +++ b/coders/jp2.c @@ -858,7 +858,7 @@ static MagickBooleanType WriteJP2Image(const ImageInfo *image_info,Image *image, Initialize JPEG 2000 API. */ if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); jp2_stream=JP2StreamManager(image); if (jp2_stream == (jas_stream_t *) NULL) ThrowWriterException(DelegateError,"UnableToManageJP2Stream"); diff --git a/coders/jpeg.c b/coders/jpeg.c index b49a4e4e4..9198db371 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -1052,8 +1052,6 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, else if (jpeg_info.out_color_space == JCS_CMYK) image->colorspace=CMYKColorspace; - else - image->colorspace=sRGBColorspace; /* Set image resolution. */ @@ -1862,7 +1860,7 @@ static MagickBooleanType WriteJPEGImage(const ImageInfo *image_info, default: { if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); break; } } diff --git a/coders/map.c b/coders/map.c index 12cccb54f..05720b45c 100644 --- a/coders/map.c +++ b/coders/map.c @@ -376,7 +376,7 @@ static MagickBooleanType WriteMAPImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); /* Allocate colormap. */ diff --git a/coders/mat.c b/coders/mat.c index 15a604e84..33dafbb49 100644 --- a/coders/mat.c +++ b/coders/mat.c @@ -1213,7 +1213,7 @@ static MagickBooleanType WriteMATImage(const ImageInfo *image_info,Image *image, do { if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); is_gray = IsImageGray(image,exception); z = is_gray ? 0 : 3; diff --git a/coders/mono.c b/coders/mono.c index 2a170305e..8d91544e0 100644 --- a/coders/mono.c +++ b/coders/mono.c @@ -314,7 +314,7 @@ static MagickBooleanType WriteMONOImage(const ImageInfo *image_info, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); /* Convert image to a bi-level image. */ diff --git a/coders/mtv.c b/coders/mtv.c index 3eaff7c96..21bfe22ce 100644 --- a/coders/mtv.c +++ b/coders/mtv.c @@ -367,7 +367,7 @@ static MagickBooleanType WriteMTVImage(const ImageInfo *image_info,Image *image, Allocate memory for pixels. */ if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); pixels=(unsigned char *) AcquireQuantumMemory((size_t) image->columns, 3UL*sizeof(*pixels)); if (pixels == (unsigned char *) NULL) diff --git a/coders/otb.c b/coders/otb.c index ff090a927..d9a47013a 100644 --- a/coders/otb.c +++ b/coders/otb.c @@ -334,7 +334,7 @@ static MagickBooleanType WriteOTBImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); /* Convert image to a bi-level image. */ diff --git a/coders/palm.c b/coders/palm.c index abc3a7be1..35eb0c6f5 100644 --- a/coders/palm.c +++ b/coders/palm.c @@ -733,7 +733,7 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info, do { if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); count=GetNumberColors(image,NULL,exception); for (bits_per_pixel=1; (one << bits_per_pixel) < count; bits_per_pixel*=2) ; if (image_info->depth > 100) diff --git a/coders/pcl.c b/coders/pcl.c index 39a0b478e..269786472 100644 --- a/coders/pcl.c +++ b/coders/pcl.c @@ -722,7 +722,7 @@ static MagickBooleanType WritePCLImage(const ImageInfo *image_info,Image *image, do { if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); /* Initialize the printer. */ diff --git a/coders/pcx.c b/coders/pcx.c index 9238f9afc..c2a3d214e 100644 --- a/coders/pcx.c +++ b/coders/pcx.c @@ -880,7 +880,7 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); page_table=(MagickOffsetType *) NULL; if ((LocaleCompare(image_info->magick,"DCX") == 0) || ((GetNextImageInList(image) != (Image *) NULL) && diff --git a/coders/pdb.c b/coders/pdb.c index e91ae7b8f..0d8413612 100644 --- a/coders/pdb.c +++ b/coders/pdb.c @@ -744,7 +744,7 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); if (image -> colors <= 2 || GetImageType( image, exception ) == BilevelType) { /* TS */ bits_per_pixel = 1; @@ -819,7 +819,7 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image, if (scanline == (unsigned char *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); /* Convert to GRAY raster scanline. */ diff --git a/coders/pdf.c b/coders/pdf.c index f90d6da78..2e5f2fc09 100644 --- a/coders/pdf.c +++ b/coders/pdf.c @@ -1258,7 +1258,7 @@ static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image, if (compression == JPEG2000Compression) { if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); } /* Scale relative to dots-per-inch. diff --git a/coders/pict.c b/coders/pict.c index 418e3d54a..36224e0fa 100644 --- a/coders/pict.c +++ b/coders/pict.c @@ -1604,7 +1604,7 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); /* Initialize image info. */ diff --git a/coders/png.c b/coders/png.c index fa709897b..0877d5db2 100644 --- a/coders/png.c +++ b/coders/png.c @@ -2342,14 +2342,12 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, { if (mng_info->have_global_srgb) { - image->colorspace=sRGBColorspace; image->rendering_intent=Magick_RenderingIntent_from_PNG_RenderingIntent (mng_info->global_srgb_intent); } if (png_get_sRGB(ping,ping_info,&intent)) { - image->colorspace=sRGBColorspace; image->rendering_intent=Magick_RenderingIntent_from_PNG_RenderingIntent (intent); @@ -3577,7 +3575,6 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, #if defined(PNG_sRGB_SUPPORTED) if (png_get_valid(ping,ping_info,PNG_INFO_sRGB)) { - image->colorspace=sRGBColorspace; (void) FormatLocaleString(msg,MaxTextExtent, "intent=%d (See Rendering intent)", (int) intent); (void) SetImageProperty(image,"png:sRGB ",msg, @@ -4238,7 +4235,6 @@ static Image *ReadOneJNGImage(MngInfo *mng_info, { if (length == 1) { - image->colorspace=sRGBColorspace; image->rendering_intent= Magick_RenderingIntent_from_PNG_RenderingIntent(p[0]); image->gamma=0.45455f; @@ -7777,7 +7773,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, } if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); /* Sometimes we get PseudoClass images whose RGB values don't match diff --git a/coders/pnm.c b/coders/pnm.c index 0f320fbaa..3563f263b 100644 --- a/coders/pnm.c +++ b/coders/pnm.c @@ -1561,7 +1561,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, if (format != '7') { if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); (void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n", (double) image->columns,(double) image->rows); (void) WriteBlobString(image,buffer); diff --git a/coders/ps.c b/coders/ps.c index 09294209f..7e0f454db 100644 --- a/coders/ps.c +++ b/coders/ps.c @@ -1448,7 +1448,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image, */ if ((IsRGBColorspace(image->colorspace) == MagickFalse) && (image->colorspace != CMYKColorspace)) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); delta.x=DefaultResolution; delta.y=DefaultResolution; resolution.x=image->resolution.x; diff --git a/coders/psd.c b/coders/psd.c index 8f83c5c0c..02d7ce02b 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -2176,7 +2176,7 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image, (image_info->colorspace != CMYKColorspace)) { if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); (void) WriteBlobMSBShort(image,(unsigned short) (image->storage_class == PseudoClass ? IndexedMode : RGBMode)); } diff --git a/coders/rgb.c b/coders/rgb.c index 0ab2a3589..09dce873b 100644 --- a/coders/rgb.c +++ b/coders/rgb.c @@ -1129,7 +1129,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, Convert MIFF to RGB raster pixels. */ if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); if ((LocaleCompare(image_info->magick,"RGBA") == 0) && (image->matte == MagickFalse)) (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception); diff --git a/coders/sgi.c b/coders/sgi.c index ecbb489bd..1b83a7212 100644 --- a/coders/sgi.c +++ b/coders/sgi.c @@ -908,7 +908,7 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image, Initialize SGI raster file header. */ if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); (void) ResetMagickMemory(&iris_info,0,sizeof(iris_info)); iris_info.magic=0x01DA; compression=image->compression; diff --git a/coders/sun.c b/coders/sun.c index 8466da596..268e444e7 100644 --- a/coders/sun.c +++ b/coders/sun.c @@ -762,7 +762,7 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image, Initialize SUN raster file header. */ if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); sun_info.magic=0x59a66a95; if ((image->columns != (unsigned int) image->columns) || (image->rows != (unsigned int) image->rows)) diff --git a/coders/tga.c b/coders/tga.c index 692393fc2..7864b91a5 100644 --- a/coders/tga.c +++ b/coders/tga.c @@ -699,7 +699,7 @@ static MagickBooleanType WriteTGAImage(const ImageInfo *image_info,Image *image, if ((image->columns > 65535L) || (image->rows > 65535L)) ThrowWriterException(ImageError,"WidthOrHeightExceedsLimit"); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); targa_info.id_length=0; value=GetImageProperty(image,"comment",exception); if (value != (const char *) NULL) diff --git a/coders/tiff.c b/coders/tiff.c index 795a9754f..a4cdd0612 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -2806,7 +2806,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, else { if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); photometric=PHOTOMETRIC_RGB; } (void) TIFFSetField(tiff,TIFFTAG_SAMPLESPERPIXEL,3); diff --git a/coders/uil.c b/coders/uil.c index 2d3fa8370..978b465b3 100644 --- a/coders/uil.c +++ b/coders/uil.c @@ -214,7 +214,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); transparent=MagickFalse; i=0; p=(const Quantum *) NULL; diff --git a/coders/vicar.c b/coders/vicar.c index 2f9c197ea..4dd58e265 100644 --- a/coders/vicar.c +++ b/coders/vicar.c @@ -458,7 +458,7 @@ static MagickBooleanType WriteVICARImage(const ImageInfo *image_info, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); /* Write header. */ diff --git a/coders/viff.c b/coders/viff.c index 8e1391341..05368510e 100644 --- a/coders/viff.c +++ b/coders/viff.c @@ -975,7 +975,7 @@ static MagickBooleanType WriteVIFFImage(const ImageInfo *image_info, Initialize VIFF image structure. */ if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); if (IsImageGray(image,exception) != MagickFalse) (void) SetImageStorageClass(image,DirectClass,exception); viff_info.identifier=(char) 0xab; diff --git a/coders/wbmp.c b/coders/wbmp.c index f915d1a58..eca3218b5 100644 --- a/coders/wbmp.c +++ b/coders/wbmp.c @@ -378,7 +378,7 @@ static MagickBooleanType WriteWBMPImage(const ImageInfo *image_info, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); /* Convert image to a bi-level image. */ diff --git a/coders/xbm.c b/coders/xbm.c index 4fb5b8698..c794764cf 100644 --- a/coders/xbm.c +++ b/coders/xbm.c @@ -511,7 +511,7 @@ static MagickBooleanType WriteXBMImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); /* Write X bitmap header. */ diff --git a/coders/xpm.c b/coders/xpm.c index 32394f105..b4fdbdc1f 100644 --- a/coders/xpm.c +++ b/coders/xpm.c @@ -632,7 +632,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); SetGeometry(image,&geometry); (void) ParseMetaGeometry(PiconGeometry,&geometry.x,&geometry.y, &geometry.width,&geometry.height); @@ -879,7 +879,7 @@ static MagickBooleanType WriteXPMImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); opacity=(-1); if (image->matte == MagickFalse) { diff --git a/coders/xwd.c b/coders/xwd.c index aa454f067..d1b8a4e93 100644 --- a/coders/xwd.c +++ b/coders/xwd.c @@ -650,7 +650,7 @@ static MagickBooleanType WriteXWDImage(const ImageInfo *image_info,Image *image, if (status == MagickFalse) return(status); if (IsRGBColorspace(image->colorspace) == MagickFalse) - (void) TransformImageColorspace(image,RGBColorspace,exception); + (void) TransformImageColorspace(image,sRGBColorspace,exception); /* Initialize XWD file header. */ -- 2.40.0