From: cristy Date: Mon, 18 May 2015 12:29:32 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~1023 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3f97ae45019a91b30792a6fa42d81a2689a7025;p=imagemagick --- diff --git a/MagickCore/cipher.c b/MagickCore/cipher.c index 2fadb705a..e26b4aa2c 100644 --- a/MagickCore/cipher.c +++ b/MagickCore/cipher.c @@ -653,7 +653,7 @@ MagickExport MagickBooleanType PasskeyDecipherImage(Image *image, image->filename); } quantum_type=GetQuantumType(image,exception); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); image_view=AcquireAuthenticCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { @@ -873,7 +873,7 @@ MagickExport MagickBooleanType PasskeyEncipherImage(Image *image, image->filename); } quantum_type=GetQuantumType(image,exception); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); image_view=AcquireAuthenticCacheView(image,exception); for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 05dd10d1a..833927b4a 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -761,15 +761,16 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend, for (i=0; i < (ssize_t) GetPixelChannels(colorize_image); i++) { - PixelTrait traits=GetPixelChannelTraits(colorize_image,i); + PixelTrait traits=GetPixelChannelTraits(colorize_image, + (PixelChannel) i); if (traits == UndefinedPixelTrait) continue; if (((traits & CopyPixelTrait) != 0) || (GetPixelReadMask(colorize_image,q) == 0)) continue; - SetPixelChannel(colorize_image,i,ClampToQuantum(Colorize(q[i], - GetPixelInfoChannel(&blend_percentage,i), - GetPixelInfoChannel(colorize,i))),q); + SetPixelChannel(colorize_image,(PixelChannel) i,ClampToQuantum( + Colorize(q[i],GetPixelInfoChannel(&blend_percentage,(PixelChannel) i), + GetPixelInfoChannel(colorize,(PixelChannel) i))),q); } q+=GetPixelChannels(colorize_image); } diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c index 21c9c452a..ce5a28246 100644 --- a/MagickCore/quantum-export.c +++ b/MagickCore/quantum-export.c @@ -3889,7 +3889,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image, assert(quantum_info != (QuantumInfo *) NULL); assert(quantum_info->signature == MagickSignature); if (pixels == (unsigned char *) NULL) - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); if (image_view == (CacheView *) NULL) { number_pixels=GetImageExtent(image); diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c index b9c975c16..fb9610f14 100644 --- a/MagickCore/quantum-import.c +++ b/MagickCore/quantum-import.c @@ -4114,7 +4114,7 @@ MagickExport size_t ImportQuantumPixels(const Image *image, assert(quantum_info != (QuantumInfo *) NULL); assert(quantum_info->signature == MagickSignature); if (pixels == (const unsigned char *) NULL) - pixels=GetQuantumPixels(quantum_info); + pixels=(const unsigned char *) GetQuantumPixels(quantum_info); x=0; p=pixels; if (image_view == (CacheView *) NULL) diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c index ced3008c1..1b01ebf61 100644 --- a/MagickWand/magick-image.c +++ b/MagickWand/magick-image.c @@ -3754,6 +3754,9 @@ WandExport MagickBooleanType MagickGetImageBackgroundColor(MagickWand *wand, */ WandExport unsigned char *MagickGetImageBlob(MagickWand *wand,size_t *length) { + unsigned char + *blob; + assert(wand != (MagickWand *) NULL); assert(wand->signature == WandSignature); if (IfMagickTrue(wand->debug)) @@ -3764,7 +3767,9 @@ WandExport unsigned char *MagickGetImageBlob(MagickWand *wand,size_t *length) "ContainsNoImages","`%s'",wand->name); return((unsigned char *) NULL); } - return(ImageToBlob(wand->image_info,wand->images,length,wand->exception)); + blob=(unsigned char *) ImageToBlob(wand->image_info,wand->images,length, + wand->exception); + return(blob); } /* @@ -3813,8 +3818,8 @@ WandExport unsigned char *MagickGetImagesBlob(MagickWand *wand,size_t *length) "ContainsNoImages","`%s'",wand->name); return((unsigned char *) NULL); } - blob=ImagesToBlob(wand->image_info,GetFirstImageInList(wand->images),length, - wand->exception); + blob=(unsigned char *) ImagesToBlob(wand->image_info,GetFirstImageInList( + wand->images),length,wand->exception); return(blob); } diff --git a/coders/art.c b/coders/art.c index 708c5fa1e..095ebd400 100644 --- a/coders/art.c +++ b/coders/art.c @@ -97,7 +97,7 @@ static MagickBooleanType */ static Image *ReadARTImage(const ImageInfo *image_info,ExceptionInfo *exception) { - const void + const unsigned char *pixels; Image @@ -165,14 +165,14 @@ static Image *ReadARTImage(const ImageInfo *image_info,ExceptionInfo *exception) q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); if (q == (Quantum *) NULL) break; - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) ThrowReaderException(CorruptImageError,"UnableToReadImageData"); (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info, GrayQuantum,pixels,exception); - pixels=ReadBlobStream(image,(size_t) (-(ssize_t) length) & 0x01, - GetQuantumPixels(quantum_info),&count); + pixels=(const unsigned char *) ReadBlobStream(image,(size_t) (-(ssize_t) + length) & 0x01,GetQuantumPixels(quantum_info),&count); if (SyncAuthenticPixels(image,exception) == MagickFalse) break; if (SetImageProgress(image,LoadImageTag,y,image->rows) == MagickFalse) @@ -322,7 +322,7 @@ static MagickBooleanType WriteARTImage(const ImageInfo *image_info,Image *image, (void) WriteBlobLSBShort(image,0); (void) WriteBlobLSBShort(image,(unsigned short) image->rows); quantum_info=AcquireQuantumInfo(image_info,image); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/bgr.c b/coders/bgr.c index 1c7a14012..c858a0210 100644 --- a/coders/bgr.c +++ b/coders/bgr.c @@ -100,7 +100,7 @@ static MagickBooleanType static Image *ReadBGRImage(const ImageInfo *image_info, ExceptionInfo *exception) { - const void + const unsigned char *pixels; Image @@ -177,7 +177,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info, image->alpha_trait=BlendPixelTrait; canvas_image->alpha_trait=BlendPixelTrait; } - pixels=(const void *) NULL; + pixels=(const unsigned char *) NULL; if (image_info->number_scenes != 0) while (image->scene < image_info->scene) { @@ -188,8 +188,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, length=GetQuantumExtent(canvas_image,quantum_info,quantum_type); for (y=0; y < (ssize_t) image->rows; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) break; } @@ -219,8 +219,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, if (scene == 0) { length=GetQuantumExtent(canvas_image,quantum_info,quantum_type); - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -278,8 +278,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } break; } @@ -300,8 +300,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, if (scene == 0) { length=GetQuantumExtent(canvas_image,quantum_info,RedQuantum); - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -379,8 +379,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -400,8 +400,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, if (scene == 0) { length=GetQuantumExtent(canvas_image,quantum_info,RedQuantum); - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -447,8 +447,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -500,8 +500,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -553,8 +553,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -615,8 +615,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -653,8 +653,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { ThrowFileException(exception,CorruptImageError, @@ -662,8 +662,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { register const Quantum @@ -708,8 +708,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -730,8 +730,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { ThrowFileException(exception,CorruptImageError, @@ -739,8 +739,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { register const Quantum @@ -785,8 +785,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -807,8 +807,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { ThrowFileException(exception,CorruptImageError, @@ -816,8 +816,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { register const Quantum @@ -862,8 +862,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -886,7 +886,7 @@ static Image *ReadBGRImage(const ImageInfo *image_info, for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length, + pixels=(const unsigned char *) ReadBlobStream(image,length, GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { @@ -895,8 +895,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { register const Quantum @@ -941,8 +941,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -1161,7 +1161,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image, quantum_info=AcquireQuantumInfo(image_info,image); if (quantum_info == (QuantumInfo *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); switch (image_info->interlace) { case NoInterlace: diff --git a/coders/bmp.c b/coders/bmp.c index 2569e094f..cd6dc7bec 100644 --- a/coders/bmp.c +++ b/coders/bmp.c @@ -1114,7 +1114,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) q+=GetPixelChannels(image); p++; } - if (x < image->columns) + if (x < (ssize_t) image->columns) break; if (SyncAuthenticPixels(image,exception) == MagickFalse) break; diff --git a/coders/cin.c b/coders/cin.c index 3e2edbbba..df281f69e 100644 --- a/coders/cin.c +++ b/coders/cin.c @@ -387,7 +387,7 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception) CINInfo cin; - const void + const unsigned char *pixels; Image @@ -706,7 +706,7 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception) /* User defined data. */ - profile=BlobToStringInfo((const void *) NULL,cin.file.user_length); + profile=BlobToStringInfo((const unsigned char *) NULL,cin.file.user_length); if (profile == (StringInfo *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); offset+=ReadBlob(image,GetStringInfoLength(profile), @@ -757,8 +757,8 @@ static Image *ReadCINImage(const ImageInfo *image_info,ExceptionInfo *exception) q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); if (q == (Quantum *) NULL) break; - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if ((size_t) count != length) break; (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info, @@ -1201,7 +1201,7 @@ static MagickBooleanType WriteCINImage(const ImageInfo *image_info,Image *image, quantum_info->quantum=32; quantum_info->pack=MagickFalse; quantum_type=RGBQuantum; - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); length=GetBytesPerRow(image->columns,3,image->depth,MagickTrue); DisableMSCWarning(4127) if (0) diff --git a/coders/cmyk.c b/coders/cmyk.c index 824600990..335d14b79 100644 --- a/coders/cmyk.c +++ b/coders/cmyk.c @@ -99,7 +99,7 @@ static MagickBooleanType static Image *ReadCMYKImage(const ImageInfo *image_info, ExceptionInfo *exception) { - const void + const unsigned char *pixels; Image @@ -170,7 +170,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, quantum_type=CMYKAQuantum; image->alpha_trait=BlendPixelTrait; } - pixels=(const void *) NULL; + pixels=(const unsigned char *) NULL; if (image_info->number_scenes != 0) while (image->scene < image_info->scene) { @@ -181,8 +181,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, length=GetQuantumExtent(canvas_image,quantum_info,quantum_type); for (y=0; y < (ssize_t) image->rows; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) break; } @@ -213,8 +213,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (scene == 0) { length=GetQuantumExtent(canvas_image,quantum_info,quantum_type); - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -273,8 +273,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } break; } @@ -296,8 +296,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (scene == 0) { length=GetQuantumExtent(canvas_image,quantum_info,CyanQuantum); - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -375,8 +375,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -396,8 +396,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (scene == 0) { length=GetQuantumExtent(canvas_image,quantum_info,CyanQuantum); - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -443,8 +443,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -496,8 +496,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -549,8 +549,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -602,8 +602,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -658,8 +658,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -696,8 +696,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { ThrowFileException(exception,CorruptImageError, @@ -705,8 +705,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { register const Quantum @@ -751,8 +751,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -773,8 +773,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { ThrowFileException(exception,CorruptImageError, @@ -782,8 +782,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { register const Quantum @@ -827,8 +827,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -849,8 +849,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { ThrowFileException(exception,CorruptImageError, @@ -858,8 +858,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { register const Quantum @@ -904,8 +904,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -926,8 +926,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { ThrowFileException(exception,CorruptImageError, @@ -935,8 +935,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { register const Quantum @@ -981,8 +981,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -1005,7 +1005,7 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length, + pixels=(const unsigned char *) ReadBlobStream(image,length, GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { @@ -1014,7 +1014,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info), &count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -1060,8 +1061,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -1270,7 +1271,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info, quantum_info=AcquireQuantumInfo(image_info,image); if (quantum_info == (QuantumInfo *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); switch (image_info->interlace) { case NoInterlace: diff --git a/coders/dpx.c b/coders/dpx.c index 64c26b249..32fb55e7d 100644 --- a/coders/dpx.c +++ b/coders/dpx.c @@ -1106,7 +1106,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) StringInfo *profile; - profile=BlobToStringInfo((const void *) NULL, + profile=BlobToStringInfo((const unsigned char *) NULL, dpx.file.user_size-sizeof(dpx.user.id)); if (profile == (StringInfo *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); @@ -1223,7 +1223,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickTrue : MagickFalse); for (y=0; y < (ssize_t) image->rows; y++) { - const void + const unsigned char *pixels; MagickBooleanType @@ -1241,8 +1241,8 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; - pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,extent, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) extent) status=MagickFalse; if ((image->progress_monitor != (MagickProgressMonitor) NULL) && @@ -1976,7 +1976,7 @@ static MagickBooleanType WriteDPXImage(const ImageInfo *image_info,Image *image, extent=GetBytesPerRow(image->columns,1UL,image->depth, dpx.image.image_element[0].packing == 0 ? MagickFalse : MagickTrue); } - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/fits.c b/coders/fits.c index 8caf8589e..8ea1f476d 100644 --- a/coders/fits.c +++ b/coders/fits.c @@ -724,7 +724,7 @@ static MagickBooleanType WriteFITSImage(const ImageInfo *image_info, /* Convert image to fits scale PseudoColor class. */ - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); if (SetImageGray(image,exception) != MagickFalse) { length=GetQuantumExtent(image,quantum_info,GrayQuantum); diff --git a/coders/fpx.c b/coders/fpx.c index 40a4061d9..3d5f19351 100644 --- a/coders/fpx.c +++ b/coders/fpx.c @@ -932,7 +932,7 @@ static MagickBooleanType WriteFPXImage(const ImageInfo *image_info,Image *image, quantum_info=AcquireQuantumInfo(image_info,image); if (quantum_info == (QuantumInfo *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); fpx_info.numberOfComponents=colorspace.numberOfComponents; for (i=0; i < (ssize_t) fpx_info.numberOfComponents; i++) { diff --git a/coders/gray.c b/coders/gray.c index 2529eecc1..7a29a0700 100644 --- a/coders/gray.c +++ b/coders/gray.c @@ -100,7 +100,7 @@ static MagickBooleanType static Image *ReadGRAYImage(const ImageInfo *image_info, ExceptionInfo *exception) { - const void + const unsigned char *pixels; Image @@ -160,7 +160,7 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, quantum_info=AcquireQuantumInfo(image_info,canvas_image); if (quantum_info == (QuantumInfo *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); - pixels=(const void *) NULL; + pixels=(const unsigned char *) NULL; if (image_info->number_scenes != 0) while (image->scene < image_info->scene) { @@ -171,8 +171,8 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, length=GetQuantumExtent(canvas_image,quantum_info,quantum_type); for (y=0; y < (ssize_t) image->rows; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) break; } @@ -195,8 +195,8 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, if (scene == 0) { length=GetQuantumExtent(canvas_image,quantum_info,quantum_type); - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -248,8 +248,8 @@ static Image *ReadGRAYImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } SetQuantumImageType(image,quantum_type); /* @@ -422,7 +422,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info, quantum_info=AcquireQuantumInfo(image_info,image); if (quantum_info == (QuantumInfo *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum diff --git a/coders/ipl.c b/coders/ipl.c index 827d9e138..19db1ddcc 100644 --- a/coders/ipl.c +++ b/coders/ipl.c @@ -330,7 +330,7 @@ static Image *ReadIPLImage(const ImageInfo *image_info,ExceptionInfo *exception) status=SetQuantumFormat(image,quantum_info,quantum_format); if (status == MagickFalse) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); if(image->columns != ipl_info.width){ /* printf("Columns not set correctly! Wanted: %.20g, got: %.20g\n", @@ -618,7 +618,7 @@ static MagickBooleanType WriteIPLImage(const ImageInfo *image_info,Image *image, /* Convert MIFF to IPL raster pixels. */ - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); if(ipl_info.colors == 1){ /* Red frame */ for(y = 0; y < (ssize_t) ipl_info.height; y++){ diff --git a/coders/mat.c b/coders/mat.c index 6f729bda2..d224aae8e 100644 --- a/coders/mat.c +++ b/coders/mat.c @@ -1267,7 +1267,7 @@ static MagickBooleanType WriteMATImage(const ImageInfo *image_info,Image *image, quantum_info=AcquireQuantumInfo(image_info,image); if (quantum_info == (QuantumInfo *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); do { for (y=0; y < (ssize_t)image->columns; y++) diff --git a/coders/miff.c b/coders/miff.c index 87749e23e..c9eeddc3f 100644 --- a/coders/miff.c +++ b/coders/miff.c @@ -1353,7 +1353,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info, default: break; } - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); length=0; for (y=0; y < (ssize_t) image->rows; y++) { @@ -2440,7 +2440,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info, break; } quantum_type=GetQuantumType(image,exception); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum diff --git a/coders/png.c b/coders/png.c index 3ebd9b26e..5ec08b393 100644 --- a/coders/png.c +++ b/coders/png.c @@ -12271,8 +12271,8 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, /* Exclude all ancillary chunks */ (void) SetImageArtifact(jpeg_image,"png:exclude-chunks","all"); - blob=ImageToBlob(jpeg_image_info,jpeg_image,&length, - exception); + blob=(unsigned char *) ImageToBlob(jpeg_image_info,jpeg_image, + &length,exception); /* Retrieve sample depth used */ value=GetImageProperty(jpeg_image,"png:bit-depth-written",exception); @@ -12295,7 +12295,7 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, if (logging != MagickFalse) (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Creating blob."); - blob=ImageToBlob(jpeg_image_info,jpeg_image,&length, + blob=(unsigned char *) ImageToBlob(jpeg_image_info,jpeg_image,&length, exception); jng_alpha_sample_depth=8; @@ -12641,7 +12641,8 @@ static MagickBooleanType WriteOneJNGImage(MngInfo *mng_info, (void) LogMagickEvent(CoderEvent,GetMagickModule(), " Creating blob."); - blob=ImageToBlob(jpeg_image_info,jpeg_image,&length,exception); + blob=(unsigned char *) ImageToBlob(jpeg_image_info,jpeg_image,&length, + exception); if (logging != MagickFalse) { diff --git a/coders/pnm.c b/coders/pnm.c index 7793aa5b5..56dd35b34 100644 --- a/coders/pnm.c +++ b/coders/pnm.c @@ -564,7 +564,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) extent=GetQuantumExtent(image,quantum_info,quantum_type); for (y=0; y < (ssize_t) image->rows; y++) { - const void + const unsigned char *pixels; MagickBooleanType @@ -582,7 +582,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; - pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), + pixels=(const unsigned char *) ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), &count); if (count != (ssize_t) extent) status=MagickFalse; @@ -637,7 +637,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); for (y=0; y < (ssize_t) image->rows; y++) { - const void + const unsigned char *pixels; MagickBooleanType @@ -658,7 +658,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; - pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), + pixels=(const unsigned char *) ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), &count); if (count != (ssize_t) extent) status=MagickFalse; @@ -754,7 +754,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) (void) SetQuantumEndian(image,quantum_info,MSBEndian); for (y=0; y < (ssize_t) image->rows; y++) { - const void + const unsigned char *pixels; MagickBooleanType @@ -775,7 +775,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; - pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), + pixels=(const unsigned char *) ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), &count); if (count != (ssize_t) extent) status=MagickFalse; @@ -954,7 +954,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); for (y=0; y < (ssize_t) image->rows; y++) { - const void + const unsigned char *pixels; MagickBooleanType @@ -975,7 +975,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; - pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), + pixels=(const unsigned char *) ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), &count); if (count != (ssize_t) extent) status=MagickFalse; @@ -1276,7 +1276,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) extent=GetQuantumExtent(image,quantum_info,quantum_type); for (y=0; y < (ssize_t) image->rows; y++) { - const void + const unsigned char *pixels; MagickBooleanType @@ -1294,7 +1294,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; - pixels=ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), + pixels=(const unsigned char *) ReadBlobStream(image,extent,GetQuantumPixels(quantum_info), &count); if ((size_t) count != extent) status=MagickFalse; @@ -1909,7 +1909,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); (void) SetQuantumEndian(image,quantum_info,MSBEndian); quantum_info->min_is_white=MagickTrue; - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -1949,7 +1949,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); (void) SetQuantumEndian(image,quantum_info,MSBEndian); quantum_info->min_is_white=MagickTrue; - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); extent=GetQuantumExtent(image,quantum_info,GrayQuantum); for (y=0; y < (ssize_t) image->rows; y++) { @@ -2065,7 +2065,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, if (quantum_info == (QuantumInfo *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); (void) SetQuantumEndian(image,quantum_info,MSBEndian); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); extent=GetQuantumExtent(image,quantum_info,quantum_type); for (y=0; y < (ssize_t) image->rows; y++) { @@ -2160,7 +2160,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, if (quantum_info == (QuantumInfo *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); (void) SetQuantumEndian(image,quantum_info,MSBEndian); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { register const Quantum @@ -2409,7 +2409,7 @@ static MagickBooleanType WritePNMImage(const ImageInfo *image_info,Image *image, status=SetQuantumFormat(image,quantum_info,FloatingPointQuantumFormat); if (status == MagickFalse) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=(ssize_t) image->rows-1; y >= 0; y--) { register const Quantum diff --git a/coders/psd.c b/coders/psd.c index 5e130abb6..54dd96771 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -547,7 +547,7 @@ static void ParseImageResourceBlocks(Image *image, if (length < 16) return; - profile=BlobToStringInfo((const void *) NULL,length); + profile=BlobToStringInfo((const unsigned char *) NULL,length); SetStringInfoDatum(profile,blocks); (void) SetImageProfile(image,"8bim",profile,exception); profile=DestroyStringInfo(profile); @@ -1829,6 +1829,9 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception) if ((has_merged_image == MagickFalse) && (GetImageListLength(image) == 1) && (length != 0)) { + MagickStatusType + status; + SeekBlob(image,offset,SEEK_SET); status=ReadPSDLayers(image,image_info,&psd_info,MagickFalse,exception); if (status != MagickTrue) @@ -2099,7 +2102,7 @@ static void WritePackbitsLength(const PSDInfo *psd_info, packet_size=next_image->depth > 8UL ? 2UL : 1UL; (void) packet_size; quantum_info=AcquireQuantumInfo(image_info,image); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) next_image->rows; y++) { p=GetVirtualPixels(next_image,0,y,next_image->columns,1,exception); @@ -2152,7 +2155,7 @@ static void WriteOneChannel(const PSDInfo *psd_info,const ImageInfo *image_info, packet_size=next_image->depth > 8UL ? 2UL : 1UL; (void) packet_size; quantum_info=AcquireQuantumInfo(image_info,image); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) next_image->rows; y++) { p=GetVirtualPixels(next_image,0,y,next_image->columns,1,exception); diff --git a/coders/raw.c b/coders/raw.c index fddac8339..90af9155e 100644 --- a/coders/raw.c +++ b/coders/raw.c @@ -96,7 +96,7 @@ static MagickBooleanType */ static Image *ReadRAWImage(const ImageInfo *image_info,ExceptionInfo *exception) { - const void + const unsigned char *pixels; Image @@ -155,7 +155,7 @@ static Image *ReadRAWImage(const ImageInfo *image_info,ExceptionInfo *exception) quantum_info=AcquireQuantumInfo(image_info,canvas_image); if (quantum_info == (QuantumInfo *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); - pixels=(const void *) NULL; + pixels=(const unsigned char *) NULL; if (image_info->number_scenes != 0) while (image->scene < image_info->scene) { @@ -166,8 +166,8 @@ static Image *ReadRAWImage(const ImageInfo *image_info,ExceptionInfo *exception) length=GetQuantumExtent(canvas_image,quantum_info,quantum_type); for (y=0; y < (ssize_t) image->rows; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) break; } @@ -189,8 +189,8 @@ static Image *ReadRAWImage(const ImageInfo *image_info,ExceptionInfo *exception) if (scene == 0) { length=GetQuantumExtent(canvas_image,quantum_info,quantum_type); - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -243,8 +243,8 @@ static Image *ReadRAWImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } SetQuantumImageType(image,quantum_type); /* @@ -548,7 +548,7 @@ static MagickBooleanType WriteRAWImage(const ImageInfo *image_info,Image *image, quantum_info=AcquireQuantumInfo(image_info,image); if (quantum_info == (QuantumInfo *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/rgb.c b/coders/rgb.c index 28835421c..27cece453 100644 --- a/coders/rgb.c +++ b/coders/rgb.c @@ -99,7 +99,7 @@ static MagickBooleanType */ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) { - const void + const unsigned char *pixels; Image @@ -176,7 +176,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) image->alpha_trait=BlendPixelTrait; canvas_image->alpha_trait=BlendPixelTrait; } - pixels=(const void *) NULL; + pixels=(const unsigned char *) NULL; if (image_info->number_scenes != 0) while (image->scene < image_info->scene) { @@ -187,8 +187,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) length=GetQuantumExtent(canvas_image,quantum_info,quantum_type); for (y=0; y < (ssize_t) image->rows; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) break; } @@ -218,8 +218,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (scene == 0) { length=GetQuantumExtent(canvas_image,quantum_info,quantum_type); - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -276,8 +276,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } break; } @@ -300,8 +300,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (scene == 0) { length=GetQuantumExtent(canvas_image,quantum_info,RedQuantum); - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -378,8 +378,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -399,8 +399,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (scene == 0) { length=GetQuantumExtent(canvas_image,quantum_info,RedQuantum); - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -445,8 +445,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -497,8 +497,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -549,8 +549,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -610,8 +610,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -648,8 +648,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { ThrowFileException(exception,CorruptImageError, @@ -657,8 +657,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { register const Quantum @@ -702,8 +702,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -724,8 +724,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { ThrowFileException(exception,CorruptImageError, @@ -733,8 +733,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { register const Quantum @@ -778,8 +778,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -800,8 +800,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { ThrowFileException(exception,CorruptImageError, @@ -809,8 +809,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { register const Quantum @@ -854,8 +854,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -878,7 +878,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length, + pixels=(const unsigned char *) ReadBlobStream(image,length, GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { @@ -887,8 +887,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { register const Quantum @@ -932,8 +932,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -1151,7 +1151,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, quantum_info=AcquireQuantumInfo(image_info,image); if (quantum_info == (QuantumInfo *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); switch (image_info->interlace) { case NoInterlace: diff --git a/coders/tiff.c b/coders/tiff.c index d0550fc06..1c25f89e0 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -1480,7 +1480,7 @@ RestoreMSCWarning method=ReadTileMethod; quantum_info->endian=LSBEndian; quantum_type=RGBQuantum; - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); switch (method) { case ReadSingleSampleMethod: @@ -1516,7 +1516,7 @@ RestoreMSCWarning TIFFClose(tiff); ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); } - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { int @@ -1573,7 +1573,7 @@ RestoreMSCWarning TIFFClose(tiff); ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); } - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { int @@ -1660,7 +1660,7 @@ RestoreMSCWarning } case ReadYCCKMethod: { - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { int @@ -3533,8 +3533,8 @@ RestoreMSCWarning if (GetTIFFInfo(image_info,tiff,&tiff_info) == MagickFalse) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); quantum_info->endian=LSBEndian; - pixels=GetQuantumPixels(quantum_info); - tiff_info.scanline=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); + tiff_info.scanline=(unsigned char *) GetQuantumPixels(quantum_info); switch (photometric) { case PHOTOMETRIC_CIELAB: diff --git a/coders/vicar.c b/coders/vicar.c index 0d7e389ce..f7c8c9e3a 100644 --- a/coders/vicar.c +++ b/coders/vicar.c @@ -149,7 +149,7 @@ static Image *ReadVICARImage(const ImageInfo *image_info, keyword[MagickPathExtent], value[MagickPathExtent]; - const void + const unsigned char *pixels; Image @@ -305,8 +305,8 @@ static Image *ReadVICARImage(const ImageInfo *image_info, q=QueueAuthenticPixels(image,0,y,image->columns,1,exception); if (q == (Quantum *) NULL) break; - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) break; (void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info, @@ -480,7 +480,7 @@ static MagickBooleanType WriteVICARImage(const ImageInfo *image_info, quantum_info=AcquireQuantumInfo(image_info,image); if (quantum_info == (QuantumInfo *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); for (y=0; y < (ssize_t) image->rows; y++) { p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/xwd.c b/coders/xwd.c index 5a90e2691..7ce7627f7 100644 --- a/coders/xwd.c +++ b/coders/xwd.c @@ -384,7 +384,7 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); } count=ReadBlob(image,length,(unsigned char *) ximage->data); - if (count != length) + if (count != (ssize_t) length) { ximage->data=DestroyString(ximage->data); ximage=(XImage *) RelinquishMagickMemory(ximage); diff --git a/coders/ycbcr.c b/coders/ycbcr.c index e2f0d2019..36d8adf5b 100644 --- a/coders/ycbcr.c +++ b/coders/ycbcr.c @@ -99,7 +99,7 @@ static MagickBooleanType static Image *ReadYCBCRImage(const ImageInfo *image_info, ExceptionInfo *exception) { - const void + const unsigned char *pixels; Image @@ -180,7 +180,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, quantum_type=RGBAQuantum; image->alpha_trait=BlendPixelTrait; } - pixels=(const void *) NULL; + pixels=(const unsigned char *) NULL; if (image_info->number_scenes != 0) while (image->scene < image_info->scene) { @@ -191,8 +191,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, length=GetQuantumExtent(canvas_image,quantum_info,quantum_type); for (y=0; y < (ssize_t) image->rows; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) break; } @@ -223,8 +223,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (scene == 0) { length=GetQuantumExtent(canvas_image,quantum_info,quantum_type); - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -272,8 +272,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (status == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } break; } @@ -294,8 +294,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (scene == 0) { length=GetQuantumExtent(canvas_image,quantum_info,RedQuantum); - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -359,8 +359,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -380,8 +380,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (scene == 0) { length=GetQuantumExtent(canvas_image,quantum_info,RedQuantum); - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } for (y=0; y < (ssize_t) image->extract_info.height; y++) { @@ -418,8 +418,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -462,8 +462,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -506,8 +506,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -553,8 +553,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -591,8 +591,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { ThrowFileException(exception,CorruptImageError, @@ -600,8 +600,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { if (count != (ssize_t) length) @@ -637,8 +637,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -659,8 +659,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { ThrowFileException(exception,CorruptImageError, @@ -668,8 +668,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { if (count != (ssize_t) length) @@ -705,8 +705,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -727,8 +727,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { ThrowFileException(exception,CorruptImageError, @@ -736,8 +736,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { if (count != (ssize_t) length) @@ -773,8 +773,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -797,7 +797,7 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, for (i=0; i < (ssize_t) scene; i++) for (y=0; y < (ssize_t) image->extract_info.height; y++) { - pixels=ReadBlobStream(image,length, + pixels=(const unsigned char *) ReadBlobStream(image,length, GetQuantumPixels(quantum_info),&count); if (count != (ssize_t) length) { @@ -806,8 +806,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, break; } } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); for (y=0; y < (ssize_t) image->extract_info.height; y++) { if (count != (ssize_t) length) @@ -844,8 +844,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info, if (SyncAuthenticPixels(image,exception) == MagickFalse) break; } - pixels=ReadBlobStream(image,length,GetQuantumPixels(quantum_info), - &count); + pixels=(const unsigned char *) ReadBlobStream(image,length, + GetQuantumPixels(quantum_info),&count); } if (image->previous == (Image *) NULL) { @@ -1059,7 +1059,7 @@ static MagickBooleanType WriteYCBCRImage(const ImageInfo *image_info, quantum_info=AcquireQuantumInfo(image_info,image); if (quantum_info == (QuantumInfo *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); - pixels=GetQuantumPixels(quantum_info); + pixels=(unsigned char *) GetQuantumPixels(quantum_info); switch (image_info->interlace) { case NoInterlace: