From bdadf31fb33adefb966fcaebdf2ea77b186fa022 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 23 Apr 2011 23:16:21 +0000 Subject: [PATCH] --- coders/aai.c | 28 ++++++++++++++++++---------- coders/art.c | 14 +++++++------- coders/avs.c | 32 ++++++++++++++++++++------------ coders/bgr.c | 15 +++++++-------- coders/rle.c | 4 ++-- coders/sun.c | 2 +- coders/webp.c | 2 +- 7 files changed, 56 insertions(+), 41 deletions(-) diff --git a/coders/aai.c b/coders/aai.c index 5b49257cd..4bfdf7481 100644 --- a/coders/aai.c +++ b/coders/aai.c @@ -177,17 +177,21 @@ static Image *ReadAAIImage(const ImageInfo *image_info,ExceptionInfo *exception) SetRedPixelComponent(q,ScaleCharToQuantum(*p++)); if (*p == 254) *p=255; - q->opacity=(Quantum) (QuantumRange-ScaleCharToQuantum(*p)); + SetOpacityPixelComponent(q,(Quantum) (QuantumRange- + ScaleCharToQuantum(*p++))); if (q->opacity != OpaqueOpacity) image->matte=MagickTrue; - p++; q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) break; - if ((image->previous == (Image *) NULL) && - (SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)) - break; + if (image->previous == (Image *) NULL) + { + status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y, + image->rows); + if (status == MagickFalse) + break; + } } pixels=(unsigned char *) RelinquishMagickMemory(pixels); if (EOFBlob(image) != MagickFalse) @@ -377,8 +381,8 @@ static MagickBooleanType WriteAAIImage(const ImageInfo *image_info,Image *image) *q++=ScaleQuantumToChar(GetBluePixelComponent(p)); *q++=ScaleQuantumToChar(GetGreenPixelComponent(p)); *q++=ScaleQuantumToChar(GetRedPixelComponent(p)); - *q=ScaleQuantumToChar((Quantum) (QuantumRange- - (image->matte != MagickFalse ? GetOpacityPixelComponent(p) : OpaqueOpacity))); + *q=ScaleQuantumToChar((Quantum) (QuantumRange-(image->matte != + MagickFalse ? GetOpacityPixelComponent(p) : OpaqueOpacity))); if (*q == 255) *q=254; p++; @@ -387,9 +391,13 @@ static MagickBooleanType WriteAAIImage(const ImageInfo *image_info,Image *image) count=WriteBlob(image,(size_t) (q-pixels),pixels); if (count != (ssize_t) (q-pixels)) break; - if ((image->previous == (Image *) NULL) && - (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)) - break; + if (image->previous == (Image *) NULL) + { + status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y, + image->rows); + if (status == MagickFalse) + break; + } } pixels=(unsigned char *) RelinquishMagickMemory(pixels); if (GetNextImageInList(image) == (Image *) NULL) diff --git a/coders/art.c b/coders/art.c index bfd92a4cc..af54e7f3a 100644 --- a/coders/art.c +++ b/coders/art.c @@ -98,9 +98,6 @@ static Image *ReadARTImage(const ImageInfo *image_info,ExceptionInfo *exception) Image *image; - ssize_t - y; - QuantumInfo *quantum_info; @@ -110,12 +107,13 @@ static Image *ReadARTImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - ssize_t - count; - size_t length; + ssize_t + count, + y; + unsigned char *pixels; @@ -341,7 +339,9 @@ static MagickBooleanType WriteARTImage(const ImageInfo *image_info,Image *image) if (count != (ssize_t) length) ThrowWriterException(CorruptImageError,"UnableToWriteImageData"); count=WriteBlob(image,(size_t) (-(ssize_t) length) & 0x01,pixels); - if (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse) + status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y, + image->rows); + if (status == MagickFalse) break; } quantum_info=DestroyQuantumInfo(quantum_info); diff --git a/coders/avs.c b/coders/avs.c index ab182df25..1a22c557b 100644 --- a/coders/avs.c +++ b/coders/avs.c @@ -98,12 +98,12 @@ static Image *ReadAVSImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - register ssize_t - x; - register PixelPacket *q; + register ssize_t + x; + register unsigned char *p; @@ -172,7 +172,7 @@ static Image *ReadAVSImage(const ImageInfo *image_info,ExceptionInfo *exception) break; for (x=0; x < (ssize_t) image->columns; x++) { - q->opacity=(Quantum) (QuantumRange-ScaleCharToQuantum(*p++)); + SetOpacityPixelComponent(q,(Quantum) (QuantumRange-ScaleCharToQuantum(*p++))); SetRedPixelComponent(q,ScaleCharToQuantum(*p++)); SetGreenPixelComponent(q,ScaleCharToQuantum(*p++)); SetBluePixelComponent(q,ScaleCharToQuantum(*p++)); @@ -182,9 +182,13 @@ static Image *ReadAVSImage(const ImageInfo *image_info,ExceptionInfo *exception) } if (SyncAuthenticPixels(image,exception) == MagickFalse) break; - if ((image->previous == (Image *) NULL) && - (SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)) - break; + if (image->previous == (Image *) NULL) + { + status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y, + image->rows); + if (status == MagickFalse) + break; + } } pixels=(unsigned char *) RelinquishMagickMemory(pixels); if (EOFBlob(image) != MagickFalse) @@ -371,8 +375,8 @@ static MagickBooleanType WriteAVSImage(const ImageInfo *image_info,Image *image) q=pixels; for (x=0; x < (ssize_t) image->columns; x++) { - *q++=ScaleQuantumToChar((Quantum) (QuantumRange- - (image->matte != MagickFalse ? GetOpacityPixelComponent(p) : OpaqueOpacity))); + *q++=ScaleQuantumToChar((Quantum) (QuantumRange-(image->matte != + MagickFalse ? GetOpacityPixelComponent(p) : OpaqueOpacity))); *q++=ScaleQuantumToChar(GetRedPixelComponent(p)); *q++=ScaleQuantumToChar(GetGreenPixelComponent(p)); *q++=ScaleQuantumToChar(GetBluePixelComponent(p)); @@ -381,9 +385,13 @@ static MagickBooleanType WriteAVSImage(const ImageInfo *image_info,Image *image) count=WriteBlob(image,(size_t) (q-pixels),pixels); if (count != (ssize_t) (q-pixels)) break; - if ((image->previous == (Image *) NULL) && - (SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,image->rows) == MagickFalse)) - break; + if (image->previous == (Image *) NULL) + { + status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y, + image->rows); + if (status == MagickFalse) + break; + } } pixels=(unsigned char *) RelinquishMagickMemory(pixels); if (GetNextImageInList(image) == (Image *) NULL) diff --git a/coders/bgr.c b/coders/bgr.c index c6abd54f4..94e4bf474 100644 --- a/coders/bgr.c +++ b/coders/bgr.c @@ -117,13 +117,13 @@ static Image *ReadBGRImage(const ImageInfo *image_info, register ssize_t i; + size_t + length; + ssize_t count, y; - size_t - length; - unsigned char *pixels; @@ -1047,8 +1047,7 @@ ModuleExport void UnregisterBGRImage(void) % o image: The image. % */ -static MagickBooleanType WriteBGRImage(const ImageInfo *image_info, - Image *image) +static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image) { MagickBooleanType status; @@ -1062,13 +1061,13 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info, QuantumType quantum_type; + size_t + length; + ssize_t count, y; - size_t - length; - unsigned char *pixels; diff --git a/coders/rle.c b/coders/rle.c index e5662d0d1..0c34790f6 100644 --- a/coders/rle.c +++ b/coders/rle.c @@ -447,7 +447,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) SetGreenPixelComponent(q,ScaleCharToQuantum(*p++)); SetBluePixelComponent(q,ScaleCharToQuantum(*p++)); if (image->matte != MagickFalse) - q->opacity=(Quantum) (QuantumRange-ScaleCharToQuantum(*p++)); + SetOpacityPixelComponent(q,(Quantum) (QuantumRange-ScaleCharToQuantum(*p++))); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) @@ -531,7 +531,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) q->red=image->colormap[*p++].red; q->green=image->colormap[*p++].green; q->blue=image->colormap[*p++].blue; - q->opacity=(Quantum) (QuantumRange-ScaleCharToQuantum(*p++)); + SetOpacityPixelComponent(q,(Quantum) (QuantumRange-ScaleCharToQuantum(*p++))); q++; } if (SyncAuthenticPixels(image,exception) == MagickFalse) diff --git a/coders/sun.c b/coders/sun.c index 9bceb0f4c..d7d9fcdfa 100644 --- a/coders/sun.c +++ b/coders/sun.c @@ -521,7 +521,7 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception) for (x=0; x < (ssize_t) image->columns; x++) { if (image->matte != MagickFalse) - q->opacity=(Quantum) (QuantumRange-ScaleCharToQuantum(*p++)); + SetOpacityPixelComponent(q,(Quantum) (QuantumRange-ScaleCharToQuantum(*p++))); if (sun_info.type == RT_STANDARD) { SetBluePixelComponent(q,ScaleCharToQuantum(*p++)); diff --git a/coders/webp.c b/coders/webp.c index 9a4cc34f3..c90dfbced 100644 --- a/coders/webp.c +++ b/coders/webp.c @@ -173,7 +173,7 @@ static Image *ReadWEBPImage(const ImageInfo *image_info, SetRedPixelComponent(q,ScaleCharToQuantum(*p++)); SetGreenPixelComponent(q,ScaleCharToQuantum(*p++)); SetBluePixelComponent(q,ScaleCharToQuantum(*p++)); - q->opacity=(Quantum) (QuantumRange-ScaleCharToQuantum(*p++)); + SetOpacityPixelComponent(q,(Quantum) (QuantumRange-ScaleCharToQuantum(*p++))); if (q->opacity != OpaqueOpacity) image->matte=MagickTrue; q++; -- 2.40.0