From cb6d09b353589ff4d029aab4dc58f42173fa3965 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 19 Jun 2010 01:59:36 +0000 Subject: [PATCH] --- magick/image.c | 96 +++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/magick/image.c b/magick/image.c index 138bb183e..dcd510e9f 100644 --- a/magick/image.c +++ b/magick/image.c @@ -487,12 +487,12 @@ MagickExport Image *AppendImages(const Image *image, register IndexPacket *restrict append_indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception); @@ -1031,12 +1031,12 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel, register const PixelPacket *restrict p; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; pixels=GetCacheViewAuthenticPixels(combine_view,0,y,combine_image->columns, @@ -1708,15 +1708,15 @@ MagickExport size_t InterpretImageFilename(const ImageInfo *image_info, const char *value; - ssize_t - depth; - register char *r; register ssize_t i; + ssize_t + depth; + /* Image option. */ @@ -1812,15 +1812,15 @@ MagickExport MagickBooleanType IsHighDynamicRangeImage(const Image *image, CacheView *image_view; - ssize_t - y; - MagickBooleanType status; MagickPixelPacket zero; + ssize_t + y; + assert(image != (Image *) NULL); assert(image->signature == MagickSignature); if (image->debug != MagickFalse) @@ -2096,12 +2096,12 @@ MagickExport Image *NewMagickImage(const ImageInfo *image_info, register IndexPacket *restrict indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception); @@ -2301,12 +2301,12 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image, register IndexPacket *restrict indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception); @@ -2551,9 +2551,6 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, IndexPacket index; - ssize_t - y; - MagickBooleanType status; @@ -2563,6 +2560,9 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, PixelPacket pixel; + ssize_t + y; + /* Set transparent pixels to background color. */ @@ -2588,12 +2588,12 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, register IndexPacket *restrict indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1, @@ -2723,9 +2723,6 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image) IndexPacket index; - ssize_t - y; - MagickBooleanType status; @@ -2735,6 +2732,9 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image) PixelPacket pixel; + ssize_t + y; + assert(image != (Image *) NULL); if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); @@ -2764,12 +2764,12 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image) register IndexPacket *restrict indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception); @@ -2827,12 +2827,12 @@ MagickExport MagickBooleanType SetImageColor(Image *image, ExceptionInfo *exception; - ssize_t - y; - MagickBooleanType status; + ssize_t + y; + assert(image != (Image *) NULL); if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); @@ -2853,12 +2853,12 @@ MagickExport MagickBooleanType SetImageColor(Image *image, register IndexPacket *restrict indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception); @@ -3507,12 +3507,12 @@ MagickExport MagickBooleanType SetImageOpacity(Image *image, ExceptionInfo *exception; - ssize_t - y; - MagickBooleanType status; + ssize_t + y; + assert(image != (Image *) NULL); if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); @@ -3526,12 +3526,12 @@ MagickExport MagickBooleanType SetImageOpacity(Image *image, #endif for (y=0; y < (ssize_t) image->rows; y++) { - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception); @@ -3840,13 +3840,13 @@ MagickExport MagickBooleanType SyncImage(Image *image) ExceptionInfo *exception; - ssize_t - y; - MagickBooleanType range_exception, status; + ssize_t + y; + assert(image != (Image *) NULL); if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); @@ -3871,12 +3871,12 @@ MagickExport MagickBooleanType SyncImage(Image *image) register IndexPacket *restrict indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception); -- 2.40.0