(no commit message)

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 6178d0ce812746656abed92534b2210a7ad2f8b3..a142e0cf074a1f9ec2c8de7d2bc10b542c33c509 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -928,14 +928,18 @@ void Magick::Image::equalize ( void )
   modifyImage();
   EqualizeImage( image(), &exceptionInfo );
   throwException( exceptionInfo );
+  (void) DestroyExceptionInfo( &exceptionInfo );
 }
 
 // Erase image to current "background color"
 void Magick::Image::erase ( void )
 {
   modifyImage();
-  SetImageBackgroundColor( image() );
-  throwImageException();
+  ExceptionInfo exceptionInfo;
+  GetExceptionInfo( &exceptionInfo );
+  SetImageBackgroundColor( image(), &exceptionInfo );
+  throwException( exceptionInfo );
+  (void) DestroyExceptionInfo( &exceptionInfo );
 }
 
 // Extends image as defined by the geometry.
@@ -1936,9 +1940,9 @@ void Magick::Image::segment ( const double clusterThreshold_,
                 (MagickBooleanType) options()->verbose(),
                 clusterThreshold_,
                 smoothingThreshold_, &exceptionInfo );
+  SyncImage( image(), &exceptionInfo );
   throwException( exceptionInfo );
   (void) DestroyExceptionInfo( &exceptionInfo );
-  SyncImage( image() );
 }
 
 // Shade image using distant light source
@@ -2650,7 +2654,11 @@ void Magick::Image::classType ( const ClassType class_ )
       // Use SyncImage to synchronize the DirectClass pixels with the
       // color map and then set to DirectClass type.
       modifyImage();
-      SyncImage( image() );
+      ExceptionInfo exceptionInfo;
+      GetExceptionInfo( &exceptionInfo );
+      SyncImage( image(), &exceptionInfo );
+      throwException( exceptionInfo );
+      (void) DestroyExceptionInfo( &exceptionInfo );
       image()->colormap = (PixelInfo *)
         RelinquishMagickMemory( image()->colormap );
       image()->storage_class = static_cast<MagickCore::ClassType>(DirectClass);

diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h
index cae94d7c103cdc53312cbbdfa32f3c3c3564c89a..5f3f7513ee347b496529d55adb554417e1a708ad 100644 (file)
--- a/Magick++/lib/Magick++/STL.h
+++ b/Magick++/lib/Magick++/STL.h
@@ -2258,26 +2258,26 @@ namespace Magick
     while( image )
       {
         // Calculate quantization error
+        MagickCore::ExceptionInfo exceptionInfo;
+        MagickCore::GetExceptionInfo( &exceptionInfo );
         if ( measureError_ )
           {
-            MagickCore::ExceptionInfo exceptionInfo;
-            MagickCore::GetExceptionInfo( &exceptionInfo );
             MagickCore::GetImageQuantizeError( image, &exceptionInfo );
             if ( exceptionInfo.severity > MagickCore::UndefinedException )
               {
                 unlinkImages( first_, last_ );
                 throwException( exceptionInfo );
               }
-            (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
           }
   
         // Udate DirectClass representation of pixels
-        MagickCore::SyncImage( image );
+        MagickCore::SyncImage( image, &exceptionInfo );
         if ( image->exception.severity > MagickCore::UndefinedException )
           {
             unlinkImages( first_, last_ );
             throwException( exceptionInfo );
           }
+        (void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
 
         // Next image
         image=image->next;
@@ -2413,7 +2413,7 @@ namespace Magick
     MagickCore::GetImageQuantizeError( image,  &exceptionInfo );
 
   // Update DirectClass representation of pixels
-  MagickCore::SyncImage( image );
+  MagickCore::SyncImage( image, &exceptionInfo );
 
   // Next image
   image=image->next;

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 4231ffd33868dec11c1b89aa76c696101e8d95d3..1748073def97fe1d51961f201cb7dc9f2f51f2b8 100644 (file)
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -242,7 +242,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
       */
       if (image->storage_class == PseudoClass)
         {
-          if (SyncImage(image) == MagickFalse)
+          if (SyncImage(image,exception) == MagickFalse)
             return(MagickFalse);
           if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
             return(MagickFalse);
@@ -297,7 +297,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
       */
       if (image->storage_class == PseudoClass)
         {
-          if (SyncImage(image) == MagickFalse)
+          if (SyncImage(image,exception) == MagickFalse)
             return(MagickFalse);
           if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
             return(MagickFalse);
@@ -351,7 +351,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
       */
       if (image->storage_class == PseudoClass)
         {
-          if (SyncImage(image) == MagickFalse)
+          if (SyncImage(image,exception) == MagickFalse)
             return(MagickFalse);
           if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
             return(MagickFalse);
@@ -411,7 +411,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
       */
       if (image->storage_class == PseudoClass)
         {
-          if (SyncImage(image) == MagickFalse)
+          if (SyncImage(image,exception) == MagickFalse)
             return(MagickFalse);
           if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
             return(MagickFalse);
@@ -471,7 +471,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
       */
       if (image->storage_class == PseudoClass)
         {
-          if (SyncImage(image) == MagickFalse)
+          if (SyncImage(image,exception) == MagickFalse)
             return(MagickFalse);
           if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
             return(MagickFalse);
@@ -531,7 +531,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
       */
       if (image->storage_class == PseudoClass)
         {
-          if (SyncImage(image) == MagickFalse)
+          if (SyncImage(image,exception) == MagickFalse)
             return(MagickFalse);
           if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
             return(MagickFalse);
@@ -1147,7 +1147,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
         image->colormap[i].blue=ScaleMapToQuantum(pixel.blue);
       }
       image_view=DestroyCacheView(image_view);
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
       break;
     }
   }
@@ -1665,7 +1665,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
       */
       if (image->storage_class == PseudoClass)
         {
-          if (SyncImage(image) == MagickFalse)
+          if (SyncImage(image,exception) == MagickFalse)
             return(MagickFalse);
           if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
             return(MagickFalse);
@@ -1723,7 +1723,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
       */
       if (image->storage_class == PseudoClass)
         {
-          if (SyncImage(image) == MagickFalse)
+          if (SyncImage(image,exception) == MagickFalse)
             return(MagickFalse);
           if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
             return(MagickFalse);
@@ -1780,7 +1780,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
       */
       if (image->storage_class == PseudoClass)
         {
-          if (SyncImage(image) == MagickFalse)
+          if (SyncImage(image,exception) == MagickFalse)
             return(MagickFalse);
           if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
             return(MagickFalse);
@@ -1846,7 +1846,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
       */
       if (image->storage_class == PseudoClass)
         {
-          if (SyncImage(image) == MagickFalse)
+          if (SyncImage(image,exception) == MagickFalse)
             return(MagickFalse);
           if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
             return(MagickFalse);
@@ -1912,7 +1912,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
       */
       if (image->storage_class == PseudoClass)
         {
-          if (SyncImage(image) == MagickFalse)
+          if (SyncImage(image,exception) == MagickFalse)
             return(MagickFalse);
           if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
             return(MagickFalse);
@@ -1978,7 +1978,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
       */
       if (image->storage_class == PseudoClass)
         {
-          if (SyncImage(image) == MagickFalse)
+          if (SyncImage(image,exception) == MagickFalse)
             return(MagickFalse);
           if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
             return(MagickFalse);
@@ -2642,7 +2642,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
         }
       }
       image_view=DestroyCacheView(image_view);
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
       break;
     }
   }

diff --git a/MagickCore/constitute.c b/MagickCore/constitute.c
index ccb5a7c5f8831ba3f7be3e502db29daa3cb7fc36..edd9124a0733e50b7b053b7e78098450dd99a3a2 100644 (file)
--- a/MagickCore/constitute.c
+++ b/MagickCore/constitute.c
@@ -203,7 +203,7 @@ MagickExport Image *ConstituteImage(const size_t columns,
     ThrowImageException(OptionError,"NonZeroWidthAndHeightRequired");
   image->columns=columns;
   image->rows=rows;
-  (void) SetImageBackgroundColor(image);
+  (void) SetImageBackgroundColor(image,exception);
   status=ImportImagePixels(image,0,0,columns,rows,map,storage,pixels,exception);
   if (status == MagickFalse)
      image=DestroyImage(image);

diff --git a/MagickCore/display.c b/MagickCore/display.c
index 59906bf68ae46c50c7182dffc6030368d6d416fe..4f68122a1e34fbf42d62ff1a9c735451981f893e 100644 (file)
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -3805,7 +3805,7 @@ static MagickBooleanType XColorEditImage(Display *display,
                       (*image)->colormap[i].blue=ScaleShortToQuantum(
                         color.blue);
                     }
-                (void) SyncImage(*image);
+                (void) SyncImage(*image,exception);
               }
             break;
           }

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index bf009691249cbd42b8e2d25edb2e47b2ddfa52e7..ac45e122907ed6e5cbe12ba4e25afebff54cdb6a 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -1419,26 +1419,26 @@ MagickExport MagickBooleanType DrawClipPath(Image *image,
         *clip_mask;
 
       clip_mask=CloneImage(image,image->columns,image->rows,MagickTrue,
-        &image->exception);
+        exception);
       if (clip_mask == (Image *) NULL)
         return(MagickFalse);
       (void) SetImageClipMask(image,clip_mask,exception);
       clip_mask=DestroyImage(clip_mask);
     }
   (void) QueryColorCompliance("#00000000",AllCompliance,
-    &image->clip_mask->background_color,&image->exception);
+    &image->clip_mask->background_color,exception);
   image->clip_mask->background_color.alpha=(Quantum) TransparentAlpha;
-  (void) SetImageBackgroundColor(image->clip_mask);
+  (void) SetImageBackgroundColor(image->clip_mask,exception);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(DrawEvent,GetMagickModule(),"\nbegin clip-path %s",
       draw_info->clip_mask);
   clone_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
   (void) CloneString(&clone_info->primitive,value);
   (void) QueryColorCompliance("#ffffff",AllCompliance,&clone_info->fill,
-    &image->exception);
+    exception);
   clone_info->clip_mask=(char *) NULL;
   status=DrawImage(image->clip_mask,clone_info,exception);
-  status|=NegateImage(image->clip_mask,MagickFalse,&image->exception);
+  status|=NegateImage(image->clip_mask,MagickFalse,exception);
   clone_info=DestroyDrawInfo(clone_info);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(DrawEvent,GetMagickModule(),"end clip-path");
@@ -3504,8 +3504,8 @@ MagickExport MagickBooleanType DrawPatternPath(Image *image,
   *pattern=AcquireImage(image_info,&image->exception);
   image_info=DestroyImageInfo(image_info);
   (void) QueryColorCompliance("#00000000",AllCompliance,
-    &(*pattern)->background_color,&image->exception);
-  (void) SetImageBackgroundColor(*pattern);
+    &(*pattern)->background_color,exception);
+  (void) SetImageBackgroundColor(*pattern,exception);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(DrawEvent,GetMagickModule(),
       "begin pattern-path %s %s",name,geometry);

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 1752666abbd83fdce1ffd659d593daa5c1a73788..80c84e79b5196c9056313212796b5e9dc26a3a0d 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -3957,7 +3957,7 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info,
       else
         {
           caption_image->background_color=image->border_color;
-          (void) SetImageBackgroundColor(caption_image);
+          (void) SetImageBackgroundColor(caption_image,exception);
           (void) CloneString(&annotate_info->text,caption);
           (void) FormatLocaleString(geometry,MaxTextExtent,"+0+%g",
             metrics.ascent);
@@ -3979,7 +3979,7 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info,
       return((Image *) NULL);
     }
   picture_image->background_color=image->border_color;
-  (void) SetImageBackgroundColor(picture_image);
+  (void) SetImageBackgroundColor(picture_image,exception);
   (void) CompositeImage(picture_image,OverCompositeOp,image,quantum,quantum,
     exception);
   if (caption_image != (Image *) NULL)
@@ -4266,7 +4266,7 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity,
   /*
     Shadow image.
   */
-  (void) SetImageBackgroundColor(border_image);
+  (void) SetImageBackgroundColor(border_image,exception);
   channel_mask=SetPixelChannelMask(border_image,AlphaChannel);
   shadow_image=BlurImage(border_image,0.0,sigma,image->bias,exception);
   (void) SetPixelChannelMap(border_image,channel_mask);
@@ -4747,7 +4747,7 @@ MagickExport Image *SteganoImage(const Image *image,const Image *watermark,
   stegano_view=DestroyCacheView(stegano_view);
   watermark_view=DestroyCacheView(watermark_view);
   if (stegano_image->storage_class == PseudoClass)
-    (void) SyncImage(stegano_image);
+    (void) SyncImage(stegano_image,exception);
   if (status == MagickFalse)
     {
       stegano_image=DestroyImage(stegano_image);
@@ -5366,7 +5366,7 @@ MagickExport Image *VignetteImage(const Image *image,const double radius,
     }
   (void) QueryColorCompliance("#000000",AllCompliance,
     &oval_image->background_color,exception);
-  (void) SetImageBackgroundColor(oval_image);
+  (void) SetImageBackgroundColor(oval_image,exception);
   draw_info=CloneDrawInfo((const ImageInfo *) NULL,(const DrawInfo *) NULL);
   (void) QueryColorCompliance("#ffffff",AllCompliance,&draw_info->fill,
     exception);

diff --git a/MagickCore/image.c b/MagickCore/image.c
index b8015a927e269c71106ede20cfa2f5850154d1bb..65c7eb593ff9fa8597d815eff8d07875ce8220cf 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -502,7 +502,7 @@ MagickExport Image *AppendImages(const Image *images,
       return((Image *) NULL);
     }
   append_image->matte=matte;
-  (void) SetImageBackgroundColor(append_image);
+  (void) SetImageBackgroundColor(append_image,exception);
   status=MagickTrue;
   x_offset=0;
   y_offset=0;
@@ -718,7 +718,7 @@ MagickExport MagickBooleanType ClipImagePath(Image *image,const char *pathname,
     return(MagickFalse);
   if (clip_mask->storage_class == PseudoClass)
     {
-      (void) SyncImage(clip_mask);
+      (void) SyncImage(clip_mask,exception);
       if (SetImageStorageClass(clip_mask,DirectClass,&image->exception) == MagickFalse)
         return(MagickFalse);
     }
@@ -2100,7 +2100,6 @@ MagickExport Image *NewMagickImage(const ImageInfo *image_info,
   image->fuzz=background->fuzz;
   image->depth=background->depth;
   status=MagickTrue;
-  exception=(&image->exception);
   image_view=AcquireCacheView(image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(dynamic,4) shared(status)
@@ -2618,21 +2617,22 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
 %
 %  The format of the SetImage method is:
 %
-%      MagickBooleanType SetImageBackgroundColor(Image *image)
+%      MagickBooleanType SetImageBackgroundColor(Image *image,
+%        ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
 %    o image: the image.
 %
+%    o exception: return any errors or warnings in this structure.
+%
 */
-MagickExport MagickBooleanType SetImageBackgroundColor(Image *image)
+MagickExport MagickBooleanType SetImageBackgroundColor(Image *image,
+  ExceptionInfo *exception)
 {
   CacheView
     *image_view;
 
-  ExceptionInfo
-    *exception;
-
   MagickBooleanType
     status;
 
@@ -2649,7 +2649,6 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image)
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
   assert(image->signature == MagickSignature);
-  exception=(&image->exception);
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   if (image->background_color.alpha != OpaqueAlpha)
@@ -3925,7 +3924,7 @@ MagickExport Image *SmushImages(const Image *images,
       return((Image *) NULL);
     }
   smush_image->matte=matte;
-  (void) SetImageBackgroundColor(smush_image);
+  (void) SetImageBackgroundColor(smush_image,exception);
   status=MagickTrue;
   x_offset=0;
   y_offset=0;
@@ -4028,12 +4027,14 @@ MagickExport MagickBooleanType StripImage(Image *image,ExceptionInfo *exception)
 %
 %  The format of the SyncImage method is:
 %
-%      MagickBooleanType SyncImage(Image *image)
+%      MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
 %    o image: the image.
 %
+%    o exception: return any errors or warnings in this structure.
+%
 */
 
 static inline Quantum PushColormapIndex(Image *image,
@@ -4045,14 +4046,11 @@ static inline Quantum PushColormapIndex(Image *image,
   return((Quantum) 0);
 }
 
-MagickExport MagickBooleanType SyncImage(Image *image)
+MagickExport MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception)
 {
   CacheView
     *image_view;
 
-  ExceptionInfo
-    *exception;
-
   MagickBooleanType
     range_exception,
     status;
@@ -4068,7 +4066,6 @@ MagickExport MagickBooleanType SyncImage(Image *image)
     return(MagickFalse);
   range_exception=MagickFalse;
   status=MagickTrue;
-  exception=(&image->exception);
   image_view=AcquireCacheView(image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(dynamic,4) shared(status)

diff --git a/MagickCore/image.h b/MagickCore/image.h
index 385fda652a68d237a9de12969235ed347924c27c..64cf5bc831e8e0a1a4a1a4e73045ede873c95867 100644 (file)
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -528,7 +528,7 @@ extern MagickExport MagickBooleanType
   SeparateImage(Image *,ExceptionInfo *),
   SetImageAlpha(Image *,const Quantum,ExceptionInfo *),
   SetImageAlphaChannel(Image *,const AlphaChannelType,ExceptionInfo *),
-  SetImageBackgroundColor(Image *),
+  SetImageBackgroundColor(Image *,ExceptionInfo *),
   SetImageClipMask(Image *,const Image *,ExceptionInfo *),
   SetImageColor(Image *,const PixelInfo *,ExceptionInfo *),
   SetImageExtent(Image *,const size_t,const size_t,ExceptionInfo *),
@@ -537,7 +537,7 @@ extern MagickExport MagickBooleanType
   SetImageStorageClass(Image *,const ClassType,ExceptionInfo *),
   SetImageType(Image *,const ImageType,ExceptionInfo *),
   StripImage(Image *,ExceptionInfo *),
-  SyncImage(Image *),
+  SyncImage(Image *,ExceptionInfo *),
   SyncImageSettings(const ImageInfo *,Image *),
   SyncImagesSettings(ImageInfo *,Image *);
 

diff --git a/MagickCore/layer.c b/MagickCore/layer.c
index 92ab7a0462660572b413e9f6b1520f559a168222..48e52b70c7d4e9c5c643592e0467960c45ccfb70 100644 (file)
--- a/MagickCore/layer.c
+++ b/MagickCore/layer.c
@@ -274,7 +274,7 @@ MagickExport Image *CoalesceImages(const Image *image,ExceptionInfo *exception)
   coalesce_image->page=bounds;
   coalesce_image->dispose=NoneDispose;
   coalesce_image->background_color.alpha=(Quantum) TransparentAlpha;
-  (void) SetImageBackgroundColor(coalesce_image);
+  (void) SetImageBackgroundColor(coalesce_image,exception);
   /*
     Coalesce rest of the images.
   */
@@ -408,7 +408,7 @@ MagickExport Image *DisposeImages(const Image *image,ExceptionInfo *exception)
   dispose_image->page.y=0;
   dispose_image->dispose=NoneDispose;
   dispose_image->background_color.alpha=(Quantum) TransparentAlpha;
-  (void) SetImageBackgroundColor(dispose_image);
+  (void) SetImageBackgroundColor(dispose_image,exception);
   dispose_images=NewImageList();
   for ( ; curr != (Image *) NULL; curr=GetNextImageInList(curr))
   {
@@ -794,7 +794,7 @@ MagickExport Image *CompareImagesLayers(const Image *image,
       return((Image *) NULL);
     }
   image_a->background_color.alpha=(Quantum) TransparentAlpha;
-  (void) SetImageBackgroundColor(image_a);
+  (void) SetImageBackgroundColor(image_a,exception);
   image_a->page=next->page;
   image_a->page.x=0;
   image_a->page.y=0;
@@ -1002,7 +1002,7 @@ static Image *OptimizeLayerFrames(const Image *image,
   prev_image->dispose=NoneDispose;
 
   prev_image->background_color.alpha=(Quantum) TransparentAlpha;
-  (void) SetImageBackgroundColor(prev_image);
+  (void) SetImageBackgroundColor(prev_image,exception);
   /*
     Figure out the area of overlay of the first frame
     No pixel could be cleared as all pixels are already cleared.
@@ -1486,7 +1486,7 @@ MagickExport void OptimizeImageTransparency(const Image *image,
   dispose_image->page.y=0;
   dispose_image->dispose=NoneDispose;
   dispose_image->background_color.alpha=(Quantum) TransparentAlpha;
-  (void) SetImageBackgroundColor(dispose_image);
+  (void) SetImageBackgroundColor(dispose_image,exception);
 
   while ( next != (Image *) NULL )
   {
@@ -2016,7 +2016,7 @@ MagickExport Image *MergeImageLayers(Image *image,const ImageLayerMethod method,
   canvas=CloneImage(image,width,height,MagickTrue,exception);
   if (canvas == (Image *) NULL)
     return((Image *) NULL);
-  (void) SetImageBackgroundColor(canvas);
+  (void) SetImageBackgroundColor(canvas,exception);
   canvas->page=page;
   canvas->dispose=UndefinedDispose;
 

diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index f695ea2dd3e938758420e6b23218f70fe6340fab..ea522c00abfce7e05df7db93d11cc159064cd307 100644 (file)
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -638,7 +638,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info,
       MaxTextExtent);
     montage->columns=MagickMax(bounds.width,1);
     montage->rows=MagickMax(bounds.height,1);
-    (void) SetImageBackgroundColor(montage);
+    (void) SetImageBackgroundColor(montage,exception);
     /*
       Set montage geometry.
     */

diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index a0ad8c9d3f2cb7f8fef4596a5de522b853316320..df3cfcacf28a670e04f84d01931f54231d614473 100644 (file)
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -675,7 +675,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info,
         q++;
       }
     }
-  (void) SyncImage(image);
+  (void) SyncImage(image,exception);
   if ((cube_info->quantize_info->colorspace != UndefinedColorspace) &&
       (cube_info->quantize_info->colorspace != CMYKColorspace))
     (void) TransformImageColorspace((Image *) image,RGBColorspace,exception);

diff --git a/MagickCore/segment.c b/MagickCore/segment.c
index b5e196856abc755bd0e7b35908bd85e4ff6199d4..ee2fa59fc9466b45a345dc16bb1fd42534572877 100644 (file)
--- a/MagickCore/segment.c
+++ b/MagickCore/segment.c
@@ -651,7 +651,7 @@ static MagickBooleanType Classify(Image *image,short **extrema,
       }
   }
   image_view=DestroyCacheView(image_view);
-  status&=SyncImage(image);
+  status&=SyncImage(image,exception);
   /*
     Relinquish resources.
   */

diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 22690fb5e5025b2888646260ba292e7d58fcc79b..bc0ab9657a820cdeec7158fe38928db4513f2c0a 100644 (file)
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -661,7 +661,7 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception)
         q->alpha=ClampToUnsignedQuantum(q->alpha);
         q++;
       }
-      return(SyncImage(image));
+      return(SyncImage(image,exception));
     }
   /*
     Clamp image.

diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index 7f692769bd77d3c77d4c18d2f231e39e17e6aa70..0e10879b53bee7db3d95623b2fc2eba69cad26ad 100644 (file)
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -511,7 +511,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry,
       if (crop_image == (Image *) NULL)
         return((Image *) NULL);
       crop_image->background_color.alpha=(Quantum) TransparentAlpha;
-      (void) SetImageBackgroundColor(crop_image);
+      (void) SetImageBackgroundColor(crop_image,exception);
       crop_image->page=bounding_box;
       crop_image->page.x=(-1);
       crop_image->page.y=(-1);
@@ -1066,7 +1066,7 @@ MagickExport Image *ExtentImage(const Image *image,
     }
   if (extent_image->background_color.alpha != OpaqueAlpha)
     extent_image->matte=MagickTrue;
-  (void) SetImageBackgroundColor(extent_image);
+  (void) SetImageBackgroundColor(extent_image,exception);
   (void) CompositeImage(extent_image,image->compose,image,-geometry->x,
     -geometry->y,exception);
   return(extent_image);
@@ -1661,7 +1661,7 @@ MagickExport Image *SpliceImage(const Image *image,
       splice_image=DestroyImage(splice_image);
       return((Image *) NULL);
     }
-  (void) SetImageBackgroundColor(splice_image);
+  (void) SetImageBackgroundColor(splice_image,exception);
   /*
     Respect image geometry.
   */
@@ -2429,7 +2429,7 @@ MagickExport Image *TrimImage(const Image *image,ExceptionInfo *exception)
       if (crop_image == (Image *) NULL)
         return((Image *) NULL);
       crop_image->background_color.alpha=(Quantum) TransparentAlpha;
-      (void) SetImageBackgroundColor(crop_image);
+      (void) SetImageBackgroundColor(crop_image,exception);
       crop_image->page=image->page;
       crop_image->page.x=(-1);
       crop_image->page.y=(-1);

diff --git a/MagickCore/version.h b/MagickCore/version.h
index c4ebbb3997cf0f9454c8eca035d70cd623725370..6e90d74f45887d1a80069131cc30c72a115d99c0 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-10-19"
+#define MagickReleaseDate  "2011-10-20"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 5283cfe5743f054391597d05dca7e321fa7e6a74..923eca4723b9c586f863d71bbf8a12e3aae00142 100644 (file)
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -8837,7 +8837,7 @@ WandExport MagickBooleanType MagickSetImageColormapColor(MagickWand *wand,
       (index >= wand->images->colors))
     ThrowWandException(WandError,"InvalidColormapIndex",wand->name);
   PixelGetQuantumPacket(color,wand->images->colormap+index);
-  return(SyncImage(wand->images));
+  return(SyncImage(wand->images,wand->exception));
 }
 \f
 /*

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 4ca2b933abef717dedcc594ef981d8ffa565d436..bbc68cc1993954559800181802790edf369c0b16 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -9018,7 +9018,7 @@ Mogrify(ref,...)
         }
         case 53:  /* Sync */
         {
-          (void) SyncImage(image);
+          (void) SyncImage(image,exception);
           break;
         }
         case 54:  /* Texture */

diff --git a/coders/bmp.c b/coders/bmp.c
index 972cf176781e0286cedfff532fa5110a82f5cd81..4cf51c1e79215e6a3ad6cae6ba0d495f65501947 100644 (file)
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -1033,7 +1033,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 break;
             }
         }
-        (void) SyncImage(image);
+        (void) SyncImage(image,exception);
         break;
       }
       case 4:
@@ -1074,7 +1074,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 break;
             }
         }
-        (void) SyncImage(image);
+        (void) SyncImage(image,exception);
         break;
       }
       case 8:
@@ -1108,7 +1108,7 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 break;
             }
         }
-        (void) SyncImage(image);
+        (void) SyncImage(image,exception);
         break;
       }
       case 16:

diff --git a/coders/caption.c b/coders/caption.c
index ace8255cebf81d525c465e011b671dfce4ecb050..dc706885c0748405d12f9ee3e603f0e29cc7464f 100644 (file)
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -199,7 +199,7 @@ static Image *ReadCAPTIONImage(const ImageInfo *image_info,
   if (image->rows == 0)
     image->rows=(size_t) ((i+1)*draw_info->pointsize+
       draw_info->interline_spacing+draw_info->stroke_width+0.5);
-  if (SetImageBackgroundColor(image) == MagickFalse)
+  if (SetImageBackgroundColor(image,exception) == MagickFalse)
     {
       InheritException(exception,&image->exception);
       image=DestroyImageList(image);

diff --git a/coders/cut.c b/coders/cut.c
index 6c4c977dc5291d5ef768ab885b3c275c3f978180..f504d273178adceeabe1656207178e8e6dd0468a 100644 (file)
--- a/coders/cut.c
+++ b/coders/cut.c
@@ -555,7 +555,7 @@ static Image *ReadCUTImage(const ImageInfo *image_info,ExceptionInfo *exception)
 
       InsertRow(depth,BImgBuff,i,image);
     }
-  (void) SyncImage(image);
+  (void) SyncImage(image,exception);
 
 
   /*detect monochrome image*/

diff --git a/coders/dib.c b/coders/dib.c
index 8e7f19cfc8667e2d136b90cca4152c6a02fdf42a..38ac86bda9f8fe0e965e6f80027bedbdcd211113 100644 (file)
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -680,7 +680,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
               break;
           }
       }
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
       break;
     }
     case 4:
@@ -721,7 +721,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
               break;
           }
       }
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
       break;
     }
     case 8:
@@ -755,7 +755,7 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception)
               break;
           }
       }
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
       break;
     }
     case 16:

diff --git a/coders/djvu.c b/coders/djvu.c
index 2a664c80f3bef19ab87438cbf6ef498cf0d4b66a..8a96229ec8fe30f8b9ff1f2bfd9e2559b1d71490 100644 (file)
--- a/coders/djvu.c
+++ b/coders/djvu.c
@@ -416,7 +416,7 @@ get_page_image(LoadContext *lc, ddjvu_page_t *page, int x, int y, int w, int h,
                                         break;
                         }
                 if (!image->ping)
-                  SyncImage(image);
+                  SyncImage(image,&image->exception);
         } else {
 #if DEBUG
                 printf("%s: expanding PHOTO page/image\n", __FUNCTION__);
@@ -693,7 +693,7 @@ static Image *ReadOneDJVUImage(LoadContext* lc,const int pagenum,
 #endif
 
         if (!image->ping)
-          SyncImage(image);
+          SyncImage(image,exception);
         /* mmc: ??? Convert PNM pixels to runlength-encoded MIFF packets. */
         /* image->colors =  */
 

diff --git a/coders/dps.c b/coders/dps.c
index 7dcdb0996a0aff6b5cd34ec7324d106eb34a6aee..ce11ba0b943e78526523f7a2673e76f8edb2299a 100644 (file)
--- a/coders/dps.c
+++ b/coders/dps.c
@@ -465,7 +465,7 @@ static Image *ReadDPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
   colors=(XColor *) RelinquishMagickMemory(colors);
   XDestroyImage(dps_image);
   if (image->storage_class == PseudoClass)
-    (void) SyncImage(image);
+    (void) SyncImage(image,exception);
   /*
     Rasterize matte image.
   */

diff --git a/coders/histogram.c b/coders/histogram.c
index d39769b61820e3e0549101b0aa9ae4ebbe4ee09b..722f11b92bd6b9ab12764864fa5f066805342405 100644 (file)
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -294,7 +294,7 @@ static MagickBooleanType WriteHISTOGRAMImage(const ImageInfo *image_info,
   */
   (void) QueryColorCompliance("#000000",AllCompliance,
     &histogram_image->background_color,exception);
-  (void) SetImageBackgroundColor(histogram_image);
+  (void) SetImageBackgroundColor(histogram_image,exception);
   for (x=0; x < (ssize_t) histogram_image->columns; x++)
   {
     q=GetAuthenticPixels(histogram_image,x,0,1,histogram_image->rows,exception);

diff --git a/coders/icon.c b/coders/icon.c
index 29226c79a0525688997d41d73c9d9e2d10ff060a..98de3b706764595beca35411ada15fc145ac94ec 100644 (file)
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -585,7 +585,7 @@ static Image *ReadICONImage(const ImageInfo *image_info,
             ThrowReaderException(CorruptImageError,"ImproperImageHeader");
         }
         if (image_info->ping == MagickFalse)
-          (void) SyncImage(image);
+          (void) SyncImage(image,exception);
         if (icon_info.bits_per_pixel != 32)
           {
             /*

diff --git a/coders/label.c b/coders/label.c
index c97acd1f5da4a71ab56382241fb4b259154b3b2e..8f12061f23f8e7dcbe79f5bae8473fde87fe81a9 100644 (file)
--- a/coders/label.c
+++ b/coders/label.c
@@ -190,7 +190,7 @@ static Image *ReadLABELImage(const ImageInfo *image_info,
   if (image->rows == 0)
     image->rows=(size_t) floor(draw_info->pointsize+draw_info->stroke_width+
       0.5);
-  if (SetImageBackgroundColor(image) == MagickFalse)
+  if (SetImageBackgroundColor(image,exception) == MagickFalse)
     {
       InheritException(exception,&image->exception);
       image=DestroyImageList(image);

diff --git a/coders/meta.c b/coders/meta.c
index 850026ebeaf76fab8da04e6077c9407db7647b2c..40f496433ea5c2c8798baa1d65842d14be6b09d5 100644 (file)
--- a/coders/meta.c
+++ b/coders/meta.c
@@ -1102,9 +1102,8 @@ static Image *ReadMETAImage(const ImageInfo *image_info,
     }
   image->columns=1;
   image->rows=1;
-  if (SetImageBackgroundColor(image) == MagickFalse)
+  if (SetImageBackgroundColor(image,exception) == MagickFalse)
     {
-      InheritException(exception,&image->exception);
       image=DestroyImageList(image);
       return((Image *) NULL);
     }

diff --git a/coders/mono.c b/coders/mono.c
index bcb041012e2a7560c49cbe4a0ba72c5feca3abf3..e1ee647475ff388e996eceeeb3f54f72f6d2b09b 100644 (file)
--- a/coders/mono.c
+++ b/coders/mono.c
@@ -181,7 +181,7 @@ static Image *ReadMONOImage(const ImageInfo *image_info,
     if (status == MagickFalse)
       break;
   }
-  (void) SyncImage(image);
+  (void) SyncImage(image,exception);
   if (EOFBlob(image) != MagickFalse)
     ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
       image->filename);

diff --git a/coders/msl.c b/coders/msl.c
index 6b55131793f72a89ed4ec614eceb327f0f46939d..8e7b0b0f5af54c6bb4eee476453976f72082c62c 100644 (file)
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -7082,7 +7082,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                 }
               }
             }
-          (void) SyncImage(msl_info->image[n]);
+          (void) SyncImage(msl_info->image[n],&exception);
           break;
         }
       ThrowMSLException(OptionError,"UnrecognizedElement",(const char *) tag);

diff --git a/coders/mvg.c b/coders/mvg.c
index 9245a7b31b5cb8760124989e2c14263f0a62ddf9..dcf27c388331393a1d7ec56b7f7caf485d407c52 100644 (file)
--- a/coders/mvg.c
+++ b/coders/mvg.c
@@ -189,9 +189,8 @@ static Image *ReadMVGImage(const ImageInfo *image_info,ExceptionInfo *exception)
     DefaultResolution;
   image->columns=(size_t) (draw_info->affine.sx*image->columns);
   image->rows=(size_t) (draw_info->affine.sy*image->rows);
-  if (SetImageBackgroundColor(image) == MagickFalse)
+  if (SetImageBackgroundColor(image,exception) == MagickFalse)
     {
-      InheritException(exception,&image->exception);
       image=DestroyImageList(image);
       return((Image *) NULL);
     }

diff --git a/coders/otb.c b/coders/otb.c
index 9c7ef2d8900fcdc6e6fc8f8adaac1a25ba2851d6..bd081775b8647d40893e1b6973b29edb6c61f0be 100644 (file)
--- a/coders/otb.c
+++ b/coders/otb.c
@@ -198,7 +198,7 @@ static Image *ReadOTBImage(const ImageInfo *image_info,ExceptionInfo *exception)
           break;
       }
   }
-  (void) SyncImage(image);
+  (void) SyncImage(image,exception);
   if (EOFBlob(image) != MagickFalse)
     ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
       image->filename);

diff --git a/coders/pattern.c b/coders/pattern.c
index f9dd5367c5260aa21d55ab093f3b2d92677eca59..5bacf7086ce310824171165fe68c29621759d78e 100644 (file)
--- a/coders/pattern.c
+++ b/coders/pattern.c
@@ -990,7 +990,7 @@ static Image *ReadPATTERNImage(const ImageInfo *image_info,
       pattern_image=image;
       image=AcquireImage(blob_info,exception);
       image->background_color=pattern_image->background_color;
-      (void) SetImageBackgroundColor(image);
+      (void) SetImageBackgroundColor(image,exception);
       (void) TextureImage(image,pattern_image,exception);
       pattern_image=DestroyImage(pattern_image);
     }

diff --git a/coders/pcx.c b/coders/pcx.c
index 14b4fb890b741fb07a0a489d2efd0c082b42c8b5..712d9e09e82bba793bd287509c1d6d69785e1ba6 100644 (file)
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -623,7 +623,7 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception)
         }
     }
     if (image->storage_class == PseudoClass)
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
     scanline=(unsigned char *) RelinquishMagickMemory(scanline);
     if (pcx_colormap != (unsigned char *) NULL)
       pcx_colormap=(unsigned char *) RelinquishMagickMemory(pcx_colormap);

diff --git a/coders/pdb.c b/coders/pdb.c
index a014d1c3980da89b3d9c436895ade776150148c2..2a0f2a8c7d07021603d63b43acc6ea11fef0d3f3 100644 (file)
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -453,7 +453,7 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         if (status == MagickFalse)
           break;
       }
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
       break;
     }
     case 2:
@@ -489,7 +489,7 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         if (status == MagickFalse)
           break;
       }
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
       break;
     }
     case 4:
@@ -519,7 +519,7 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception)
         if (status == MagickFalse)
           break;
       }
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
       break;
     }
     default:

diff --git a/coders/pict.c b/coders/pict.c
index eb3721ef69ca9cf90380588a2a91c2acf05bd27f..4a805ffdbdb7df347728e6798af2e1717b63dd4c 100644 (file)
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -930,7 +930,7 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
               break;
             image->columns=1UL*(frame.right-frame.left);
             image->rows=1UL*(frame.bottom-frame.top);
-            (void) SetImageBackgroundColor(image);
+            (void) SetImageBackgroundColor(image,exception);
             break;
           }
           case 0x12:

diff --git a/coders/pix.c b/coders/pix.c
index 0797845792ba60826a62a5f34ff73f253b79da24..fe0c09b69bce5f83baf0605402374302ec9f8a88 100644 (file)
--- a/coders/pix.c
+++ b/coders/pix.c
@@ -202,7 +202,7 @@ static Image *ReadPIXImage(const ImageInfo *image_info,ExceptionInfo *exception)
         }
     }
     if (image->storage_class == PseudoClass)
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
     if (EOFBlob(image) != MagickFalse)
       {
         ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",

diff --git a/coders/png.c b/coders/png.c
index 458d23f9b4b77f47e8a7ef543bba4cda1112acb7..e67d6841daba84817b2d0257ae879105d2343d1f 100644 (file)
--- a/coders/png.c
+++ b/coders/png.c
@@ -3215,7 +3215,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
 
       matte=image->matte;
       image->matte=MagickFalse;
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
       image->matte=matte;
     }
 
@@ -3227,7 +3227,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
       png_destroy_read_struct(&ping,&ping_info,&end_info);
       ping_pixels=(unsigned char *) RelinquishMagickMemory(ping_pixels);
       image->colors=2;
-      (void) SetImageBackgroundColor(image);
+      (void) SetImageBackgroundColor(image,exception);
 #if defined(PNG_SETJMP_NOT_THREAD_SAFE)
       UnlockSemaphoreInfo(ping_semaphore);
 #endif
@@ -3272,7 +3272,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info,
                  }
               }
             }
-          (void) SyncImage(image);
+          (void) SyncImage(image,exception);
         }
 
 #if 1 /* Should have already been done above, but glennrp problem P10
@@ -5372,7 +5372,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 image->background_color=mng_background_color;
                 image->matte=MagickFalse;
                 image->delay=0;
-                (void) SetImageBackgroundColor(image);
+                (void) SetImageBackgroundColor(image,exception);
 
                 if (logging != MagickFalse)
                   (void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -5926,7 +5926,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 image->page.x=0;
                 image->page.y=0;
                 image->background_color=mng_background_color;
-                (void) SetImageBackgroundColor(image);
+                (void) SetImageBackgroundColor(image,exception);
                 if (logging != MagickFalse)
                   (void) LogMagickEvent(CoderEvent,GetMagickModule(),
                     "  Inserted transparent background layer, W=%.20g, H=%.20g",
@@ -5979,7 +5979,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
             image->page.y=mng_info->clip.top;
             image->background_color=mng_background_color;
             image->matte=MagickFalse;
-            (void) SetImageBackgroundColor(image);
+            (void) SetImageBackgroundColor(image,exception);
 
             if (logging != MagickFalse)
               (void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -6242,12 +6242,12 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
 #endif
 
                 if (image->matte != MagickFalse)
-                   (void) SetImageBackgroundColor(large_image);
+                   (void) SetImageBackgroundColor(large_image,exception);
 
                 else
                   {
                     large_image->background_color.alpha=OpaqueAlpha;
-                    (void) SetImageBackgroundColor(large_image);
+                    (void) SetImageBackgroundColor(large_image,exception);
 
                     if (magn_methx == 4)
                       magn_methx=2;
@@ -6700,7 +6700,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
                 image->columns=1;
                 image->rows=1;
                 image->colors=2;
-                (void) SetImageBackgroundColor(image);
+                (void) SetImageBackgroundColor(image,exception);
                 image->page.width=1;
                 image->page.height=1;
                 image->page.x=0;
@@ -6786,7 +6786,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception)
       image->matte=MagickFalse;
 
       if (image_info->ping == MagickFalse)
-        (void) SetImageBackgroundColor(image);
+        (void) SetImageBackgroundColor(image,exception);
 
       mng_info->image_found++;
     }
@@ -7717,7 +7717,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
      (mng_info->write_png_colortype != 0 &&
      mng_info->write_png_colortype != 4)))
     {
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
       image->storage_class = DirectClass;
     }
 
@@ -7742,7 +7742,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info,
     the colors in the colormap.  This code syncs the RGB values.
   */
   if (image->depth <= 8 && image->taint && image->storage_class == PseudoClass)
-     (void) SyncImage(image);
+     (void) SyncImage(image,exception);
 
 #if (MAGICKCORE_QUANTUM_DEPTH == 8)
   if (image->depth > 8)
@@ -11000,7 +11000,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
       else
         (void) SetImageType(image,TrueColorType,exception);
 
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
     }
 
   if (mng_info->write_png32)
@@ -11015,7 +11015,7 @@ static MagickBooleanType WritePNGImage(const ImageInfo *image_info,
       else
         (void) SetImageType(image,TrueColorType,exception);
 
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
     }
 
   value=GetImageOption(image_info,"png:bit-depth");

diff --git a/coders/psd.c b/coders/psd.c
index 1206660292477e53f9cb0aa8fe3a11f656a91080..f6d0c6b9640ea76b4bef130fff36a121c6630baf 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -824,7 +824,7 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
   image->depth=psd_info.depth;
   image->columns=psd_info.columns;
   image->rows=psd_info.rows;
-  if (SetImageBackgroundColor(image) == MagickFalse)
+  if (SetImageBackgroundColor(image,exception) == MagickFalse)
     {
       InheritException(exception,&image->exception);
       image=DestroyImageList(image);
@@ -1206,7 +1206,7 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
               (void) LogMagickEvent(CoderEvent,GetMagickModule(),
                 "    setting up new layer image");
             if (image_info->ping != MagickFalse)
-              (void) SetImageBackgroundColor(layer_info[i].image);
+              (void) SetImageBackgroundColor(layer_info[i].image,exception);
             layer_info[i].image->compose=
               PSDBlendModeToCompositeOperator(layer_info[i].blendkey);
             if (layer_info[i].visible == MagickFalse)

diff --git a/coders/rle.c b/coders/rle.c
index 20f2ac3e6912fde24eb230281c5494ef5b112f45..61c3bda58dec32bdb4079a8d20989778a2aea13f 100644 (file)
--- a/coders/rle.c
+++ b/coders/rle.c
@@ -515,7 +515,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception)
                     break;
                 }
             }
-            (void) SyncImage(image);
+            (void) SyncImage(image,exception);
           }
         else
           {

diff --git a/coders/sgi.c b/coders/sgi.c
index 90ba848303e5d1b1f0a2578a08cf5df6ecbba4f5..33aeb05d312af3fd15b452b6dcaf17df046436b2 100644 (file)
--- a/coders/sgi.c
+++ b/coders/sgi.c
@@ -664,7 +664,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception)
                   break;
               }
           }
-        (void) SyncImage(image);
+        (void) SyncImage(image,exception);
       }
     iris_pixels=(unsigned char *) RelinquishMagickMemory(iris_pixels);
     if (EOFBlob(image) != MagickFalse)

diff --git a/coders/stegano.c b/coders/stegano.c
index c5922d550ac31b1e38c331d62f52ebb1b40b3153..a0fdd3ae3012ab30b937e5e5432268ad2307c3e3 100644 (file)
--- a/coders/stegano.c
+++ b/coders/stegano.c
@@ -230,7 +230,7 @@ static Image *ReadSTEGANOImage(const ImageInfo *image_info,
       break;
   }
   watermark=DestroyImage(watermark);
-  (void) SyncImage(image);
+  (void) SyncImage(image,exception);
   return(GetFirstImageInList(image));
 }
 \f

diff --git a/coders/sun.c b/coders/sun.c
index 673b5ad25b69fac00a46141e3a6d9885401f32f7..f7ec8b9a7dbc95e6c1ff855969fdfe28eade4e96 100644 (file)
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -564,7 +564,7 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception)
           }
         }
     if (image->storage_class == PseudoClass)
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
     sun_pixels=(unsigned char *) RelinquishMagickMemory(sun_pixels);
     if (EOFBlob(image) != MagickFalse)
       {

diff --git a/coders/svg.c b/coders/svg.c
index e67152dfe47a3c441a06c64fb12241a744b3c6b5..b860c85c4a70de6edf6d7ec82ce4636b120a3f35 100644 (file)
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -2888,7 +2888,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception)
               ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
             }
 #endif
-          (void) SetImageBackgroundColor(image);
+          (void) SetImageBackgroundColor(image,exception);
 #if defined(MAGICKCORE_CAIRO_DELEGATE)
           cairo_surface=cairo_image_surface_create_for_data(pixels,
             CAIRO_FORMAT_ARGB32,image->columns,image->rows,4*image->columns);

diff --git a/coders/tile.c b/coders/tile.c
index fc7a1c737c2e430f0dec30b75acc64ce60b1aadd..a5d4cf1ec122a6ca431804018da8729f62e6368e 100644 (file)
--- a/coders/tile.c
+++ b/coders/tile.c
@@ -118,7 +118,7 @@ static Image *ReadTILEImage(const ImageInfo *image_info,
     ThrowReaderException(OptionError,"MustSpecifyAnImageName");
   image->matte=tile_image->matte;
   if (image->matte != MagickFalse)
-    (void) SetImageBackgroundColor(image);
+    (void) SetImageBackgroundColor(image,exception);
   (void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent);
   if (LocaleCompare(tile_image->magick,"PATTERN") == 0)
     {

diff --git a/coders/tim.c b/coders/tim.c
index 3e49e9df46705600079eb497019273094c74662c..9fbfc369741a468ff8cae7ed0d0c34b69d1abf45 100644 (file)
--- a/coders/tim.c
+++ b/coders/tim.c
@@ -382,7 +382,7 @@ static Image *ReadTIMImage(const ImageInfo *image_info,ExceptionInfo *exception)
         ThrowReaderException(CorruptImageError,"ImproperImageHeader");
     }
     if (image->storage_class == PseudoClass)
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
     tim_pixels=(unsigned char *) RelinquishMagickMemory(tim_pixels);
     if (EOFBlob(image) != MagickFalse)
       {

diff --git a/coders/txt.c b/coders/txt.c
index d86cadf43c0f454b617c834eac697bb78e0d9e28..b001c70468770a2ccadd2112284c146b5af1eb19 100644 (file)
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -245,7 +245,7 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
   /*
     Annotate the text image.
   */
-  (void) SetImageBackgroundColor(image);
+  (void) SetImageBackgroundColor(image,exception);
   draw_info=CloneDrawInfo(image_info,(DrawInfo *) NULL);
   (void) CloneString(&draw_info->text,image_info->filename);
   (void) FormatLocaleString(geometry,MaxTextExtent,"0x0%+ld%+ld",(long) page.x,
@@ -308,7 +308,7 @@ static Image *ReadTEXTImage(const ImageInfo *image_info,Image *image,
     image->next->rows=image->rows;
     image=SyncNextImageInList(image);
     (void) CopyMagickString(image->filename,filename,MaxTextExtent);
-    (void) SetImageBackgroundColor(image);
+    (void) SetImageBackgroundColor(image,exception);
     status=SetImageProgress(image,LoadImagesTag,TellBlob(image),
       GetBlobSize(image));
     if (status == MagickFalse)
@@ -443,7 +443,7 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception)
       ThrowReaderException(CorruptImageError,"ImproperImageHeader");
     image->colorspace=(ColorspaceType) type;
     (void) ResetMagickMemory(&pixel,0,sizeof(pixel));
-    (void) SetImageBackgroundColor(image);
+    (void) SetImageBackgroundColor(image,exception);
     range=GetQuantumRange(image->depth);
     for (y=0; y < (ssize_t) image->rows; y++)
     {

diff --git a/coders/viff.c b/coders/viff.c
index 0241ad0cdf768e3396a856066f9ce180938414fd..e828c04a406198ab11182bc2364586f3ca43ec5a 100644 (file)
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -724,7 +724,7 @@ static Image *ReadVIFFImage(const ImageInfo *image_info,
         }
     viff_pixels=(unsigned char *) RelinquishMagickMemory(viff_pixels);
     if (image->storage_class == PseudoClass)
-      (void) SyncImage(image);
+      (void) SyncImage(image,exception);
     if (EOFBlob(image) != MagickFalse)
       {
         ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",

diff --git a/coders/wbmp.c b/coders/wbmp.c
index 89f4370efe2e98213e9dbf8affa3205fc7038d57..1d64cfa95cab23108602bfaf695f2e7f51b61f54 100644 (file)
--- a/coders/wbmp.c
+++ b/coders/wbmp.c
@@ -212,7 +212,7 @@ static Image *ReadWBMPImage(const ImageInfo *image_info,
     if (status == MagickFalse)
       break;
   }
-  (void) SyncImage(image);
+  (void) SyncImage(image,exception);
   if (EOFBlob(image) != MagickFalse)
     ThrowFileException(exception,CorruptImageError,"UnexpectedEndOfFile",
       image->filename);

diff --git a/coders/xbm.c b/coders/xbm.c
index c5ccffc5405cccd5654c1230c3e08cfa64b1744c..e4f30358b100c3407445acfb138255069a5d43ca 100644 (file)
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -376,7 +376,7 @@ static Image *ReadXBMImage(const ImageInfo *image_info,ExceptionInfo *exception)
       break;
   }
   data=(unsigned char *) RelinquishMagickMemory(data);
-  (void) SyncImage(image);
+  (void) SyncImage(image,exception);
   (void) CloseBlob(image);
   return(GetFirstImageInList(image));
 }

diff --git a/coders/xcf.c b/coders/xcf.c
index 6c5b89053a066ac1dcd372371e5c5f303b7bfcad..53d86b7896d29c694d8274da988e6158c4bfdda8 100644 (file)
--- a/coders/xcf.c
+++ b/coders/xcf.c
@@ -880,7 +880,7 @@ static MagickBooleanType ReadOneLayer(Image* image,XCFDocInfo* inDocInfo,
   /* clear the image based on the layer opacity */
   outLayer->image->background_color.alpha=
     ScaleCharToQuantum((unsigned char) (255-outLayer->alpha));    
-  (void) SetImageBackgroundColor(outLayer->image);
+  (void) SetImageBackgroundColor(outLayer->image,exception);
 
   /* set the compositing mode */
   outLayer->image->compose = GIMPBlendModeToCompositeOperator( outLayer->mode );
@@ -1040,7 +1040,7 @@ static Image *ReadXCFImage(const ImageInfo *image_info,ExceptionInfo *exception)
     else
       if (image_type == GIMP_INDEXED)
         ThrowReaderException(CoderError,"ColormapTypeNotSupported");
-  (void) SetImageBackgroundColor(image);
+  (void) SetImageBackgroundColor(image,exception);
   image->matte=MagickTrue;
   /*
     Read properties.