(no commit message)

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 4ada438d61df3f8e37c4b7d4ffe9a9284e997f0d..3083a4ac76fef13c40e5eca7b485f58c80f74529 100644 (file)
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1245,7 +1245,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
       if (image->storage_class != DirectClass)
         (void) SetImageStorageClass(image,DirectClass,&image->exception);
       if (image->matte == MagickFalse)
-        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,&image->exception);
     }
   direction=1.0;
   if (draw_info->direction == RightToLeftDirection)
@@ -1770,12 +1770,13 @@ static MagickBooleanType RenderPostscript(Image *image,
       /*
         Render fill color.
       */
+      exception=(&image->exception);
       if (image->matte == MagickFalse)
-        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
       if (annotate_image->matte == MagickFalse)
-        (void) SetImageAlphaChannel(annotate_image,OpaqueAlphaChannel);
+        (void) SetImageAlphaChannel(annotate_image,OpaqueAlphaChannel,
+          exception);
       fill_color=draw_info->fill;
-      exception=(&image->exception);
       annotate_view=AcquireCacheView(annotate_image);
       for (y=0; y < (ssize_t) annotate_image->rows; y++)
       {

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index c5a3c4c585fb52f377c52ebdf0f11a61dead51f8..fde7e9365edcd561ab9445326591e8a75b122e3a 100644 (file)
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -228,11 +228,11 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
       break;
     }
   }
-  if (SetImageColorspace(image,colorspace) == MagickFalse)
+  exception=(&image->exception);
+  if (SetImageColorspace(image,colorspace,exception) == MagickFalse)
     return(MagickFalse);
   status=MagickTrue;
   progress=0;
-  exception=(&image->exception);
   switch (colorspace)
   {
     case CMYColorspace:
@@ -1157,7 +1157,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
   z_map=(TransformPacket *) RelinquishMagickMemory(z_map);
   y_map=(TransformPacket *) RelinquishMagickMemory(y_map);
   x_map=(TransformPacket *) RelinquishMagickMemory(x_map);
-  if (SetImageColorspace(image,colorspace) == MagickFalse)
+  if (SetImageColorspace(image,colorspace,exception) == MagickFalse)
     return(MagickFalse);
   return(status);
 }
@@ -1178,7 +1178,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
 %  The format of the SetImageColorspace method is:
 %
 %      MagickBooleanType SetImageColorspace(Image *image,
-%        const ColorspaceType colorspace)
+%        const ColorspaceType colorspace,ExceptiionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -1186,12 +1186,17 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
 %
 %    o colorspace: the colorspace.
 %
+%   o exception: return any errors or warnings in this structure.
+%
 */
 MagickExport MagickBooleanType SetImageColorspace(Image *image,
-  const ColorspaceType colorspace)
+  const ColorspaceType colorspace,ExceptionInfo *exception)
 {
+  PixelPacket
+    pixel;
+
   image->colorspace=colorspace;
-  return(MagickTrue);
+  return(GetOneAuthenticPixel(image,0,0,&pixel,exception));
 }
 \f
 /*
@@ -1230,7 +1235,7 @@ MagickExport MagickBooleanType TransformImageColorspace(Image *image,
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   if (colorspace == UndefinedColorspace)
-    return(SetImageColorspace(image,colorspace));
+    return(SetImageColorspace(image,colorspace,&image->exception));
   if (image->colorspace == colorspace)
     return(MagickTrue);
   if ((colorspace == RGBColorspace) ||
@@ -1707,7 +1712,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           status=MagickFalse;
       }
       image_view=DestroyCacheView(image_view);
-      if (SetImageColorspace(image,RGBColorspace) == MagickFalse)
+      if (SetImageColorspace(image,RGBColorspace,exception) == MagickFalse)
         return(MagickFalse);
       return(status);
     }
@@ -1767,7 +1772,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           status=MagickFalse;
       }
       image_view=DestroyCacheView(image_view);
-      if (SetImageColorspace(image,RGBColorspace) == MagickFalse)
+      if (SetImageColorspace(image,RGBColorspace,exception) == MagickFalse)
         return(MagickFalse);
       return(status);
     }
@@ -1833,7 +1838,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           status=MagickFalse;
       }
       image_view=DestroyCacheView(image_view);
-      if (SetImageColorspace(image,RGBColorspace) == MagickFalse)
+      if (SetImageColorspace(image,RGBColorspace,exception) == MagickFalse)
         return(MagickFalse);
       return(status);
     }
@@ -1899,7 +1904,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           status=MagickFalse;
       }
       image_view=DestroyCacheView(image_view);
-      if (SetImageColorspace(image,RGBColorspace) == MagickFalse)
+      if (SetImageColorspace(image,RGBColorspace,exception) == MagickFalse)
         return(MagickFalse);
       return(status);
     }
@@ -1965,7 +1970,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           status=MagickFalse;
       }
       image_view=DestroyCacheView(image_view);
-      if (SetImageColorspace(image,RGBColorspace) == MagickFalse)
+      if (SetImageColorspace(image,RGBColorspace,exception) == MagickFalse)
         return(MagickFalse);
       return(status);
     }
@@ -2038,7 +2043,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           status=MagickFalse;
       }
       image_view=DestroyCacheView(image_view);
-      if (SetImageColorspace(image,RGBColorspace) == MagickFalse)
+      if (SetImageColorspace(image,RGBColorspace,exception) == MagickFalse)
         return(MagickFalse);
       return(status);
     }
@@ -2136,7 +2141,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
       }
       image_view=DestroyCacheView(image_view);
       logmap=(Quantum *) RelinquishMagickMemory(logmap);
-      if (SetImageColorspace(image,RGBColorspace) == MagickFalse)
+      if (SetImageColorspace(image,RGBColorspace,exception) == MagickFalse)
         return(MagickFalse);
       return(status);
     }
@@ -2650,7 +2655,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
   z_map=(TransformPacket *) RelinquishMagickMemory(z_map);
   y_map=(TransformPacket *) RelinquishMagickMemory(y_map);
   x_map=(TransformPacket *) RelinquishMagickMemory(x_map);
-  if (SetImageColorspace(image,RGBColorspace) == MagickFalse)
+  if (SetImageColorspace(image,RGBColorspace,exception) == MagickFalse)
     return(MagickFalse);
   return(MagickTrue);
 }

diff --git a/MagickCore/colorspace.h b/MagickCore/colorspace.h
index 8c67028560f66d4b720a0775462eeb38df70f5da..22cf4a04f8328f353d8ec8d4de613bfb8e748dd1 100644 (file)
--- a/MagickCore/colorspace.h
+++ b/MagickCore/colorspace.h
@@ -51,7 +51,7 @@ typedef enum
 
 extern MagickExport MagickBooleanType
   RGBTransformImage(Image *,const ColorspaceType),
-  SetImageColorspace(Image *,const ColorspaceType),
+  SetImageColorspace(Image *,const ColorspaceType,ExceptionInfo *),
   TransformImageColorspace(Image *,const ColorspaceType),
   TransformRGBImage(Image *,const ColorspaceType);
 

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 535cb19ab14ba84e21b6dc33cc54e6a11cbaa853..61e98a152671823bd8fb1af5cedd008e6bb95ad2 100644 (file)
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -146,7 +146,7 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image,
   difference_image=CloneImage(image,0,0,MagickTrue,exception);
   if (difference_image == (Image *) NULL)
     return((Image *) NULL);
-  (void) SetImageAlphaChannel(difference_image,OpaqueAlphaChannel);
+  (void) SetImageAlphaChannel(difference_image,OpaqueAlphaChannel,exception);
   highlight_image=CloneImage(image,image->columns,image->rows,MagickTrue,
     exception);
   if (highlight_image == (Image *) NULL)
@@ -160,7 +160,7 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image,
       highlight_image=DestroyImage(highlight_image);
       return((Image *) NULL);
     }
-  (void) SetImageAlphaChannel(highlight_image,OpaqueAlphaChannel);
+  (void) SetImageAlphaChannel(highlight_image,OpaqueAlphaChannel,exception);
   (void) QueryMagickColor("#f1001ecc",&highlight,exception);
   artifact=GetImageArtifact(image,"highlight-color");
   if (artifact != (const char *) NULL)

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 08e4eb1675d23fa610dd5b9a60667219490204d0..8ba9c3869e58397f7f02bae104f50894b115632c 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -1709,7 +1709,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
         channel to exist, to add transparency.
       */
       if (image->matte == MagickFalse)
-        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
       modify_outside_overlay=MagickTrue;
       break;
     }

diff --git a/MagickCore/display.c b/MagickCore/display.c
index 0c893235d236479155d9a0c459079d3390eb5d84..174f044b6da4c38cf2c0d40cc8c062c4c580a8fd 100644 (file)
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -4295,10 +4295,10 @@ static MagickBooleanType XCompositeImage(Display *display,
       /*
         Create mattes for blending.
       */
-      (void) SetImageAlphaChannel(composite_image,OpaqueAlphaChannel);
+      exception=(&image->exception);
+      (void) SetImageAlphaChannel(composite_image,OpaqueAlphaChannel,exception);
       opacity=(Quantum) (ScaleQuantumToChar((Quantum) QuantumRange)-
         ((ssize_t) ScaleQuantumToChar((Quantum) QuantumRange)*blend)/100);
-      exception=(&image->exception);
       if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
         return(MagickFalse);
       image->matte=MagickTrue;

diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index ef480d2d28b43631a1eb455c6afdcdedeaf790f3..816d9e8520e5244d604319385a4b62545bf231f8 100644 (file)
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -1447,16 +1447,15 @@ MagickExport Image *DistortResizeImage(const Image *image,
       /*
         Image has not transparency channel, so we free to use it
       */
-      (void) SetImageAlphaChannel(tmp_image,SetAlphaChannel);
+      (void) SetImageAlphaChannel(tmp_image,SetAlphaChannel,exception);
       resize_image=DistortImage(tmp_image,AffineDistortion,12,distort_args,
-            MagickTrue,exception),
+        MagickTrue,exception),
 
       tmp_image=DestroyImage(tmp_image);
       if ( resize_image == (Image *) NULL )
         return((Image *) NULL);
 
-      (void) SetImageAlphaChannel(resize_image,DeactivateAlphaChannel);
-      InheritException(exception,&image->exception);
+      (void) SetImageAlphaChannel(resize_image,DeactivateAlphaChannel,exception);
     }
   else
     {
@@ -1472,7 +1471,7 @@ MagickExport Image *DistortResizeImage(const Image *image,
       PushPixelChannelMap(tmp_image,AlphaChannel);
       (void) SeparateImage(tmp_image);
       PopPixelChannelMap(tmp_image);
-      (void) SetImageAlphaChannel(tmp_image,OpaqueAlphaChannel);
+      (void) SetImageAlphaChannel(tmp_image,OpaqueAlphaChannel,exception);
       resize_alpha=DistortImage(tmp_image,AffineDistortion,12,distort_args,
         MagickTrue,exception),
       tmp_image=DestroyImage(tmp_image);
@@ -1494,11 +1493,10 @@ MagickExport Image *DistortResizeImage(const Image *image,
           return((Image *) NULL);
         }
       /* replace resize images alpha with the separally distorted alpha */
-      (void) SetImageAlphaChannel(resize_image,DeactivateAlphaChannel);
-      (void) SetImageAlphaChannel(resize_alpha,DeactivateAlphaChannel);
+      (void) SetImageAlphaChannel(resize_image,DeactivateAlphaChannel,exception);
+      (void) SetImageAlphaChannel(resize_alpha,DeactivateAlphaChannel,exception);
       (void) CompositeImage(resize_image,CopyOpacityCompositeOp,resize_alpha,
-                    0,0);
-      InheritException(exception,&resize_image->exception);
+        0,0);
       resize_alpha=DestroyImage(resize_alpha);
     }
   (void) SetImageVirtualPixelMethod(resize_image,vp_save);

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index ad61ec18e50afb2b6df1d0f2775738fe44764288..bcf3aea6a76dc6448de93dcbb5e779e0a5b5d184 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -3922,7 +3922,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image,
     Draw polygon or line.
   */
   if (image->matte == MagickFalse)
-    (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+    (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(dynamic,4) shared(status)
 #endif
@@ -4286,7 +4286,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
     case MattePrimitive:
     {
       if (image->matte == MagickFalse)
-        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
       switch (primitive_info->method)
       {
         case PointMethod:
@@ -4475,7 +4475,8 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
           (void) TransformImage(&composite_image,(char *) NULL,geometry);
         }
       if (composite_image->matte == MagickFalse)
-        (void) SetImageAlphaChannel(composite_image,OpaqueAlphaChannel);
+        (void) SetImageAlphaChannel(composite_image,OpaqueAlphaChannel,
+          exception);
       if (draw_info->alpha != OpaqueAlpha)
         (void) SetImageOpacity(composite_image,draw_info->alpha);
       SetGeometry(image,&geometry);

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 7051b1a388d9b5a8c963c261cc61132620278f40..8c37a2ebf635698a11662e728dbdd1fddbc05c02 100644 (file)
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -822,7 +822,7 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image)
   clut_map=(PixelInfo *) RelinquishMagickMemory(clut_map);
   if ((clut_image->matte != MagickFalse) &&
       ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0))
-    (void) SetImageAlphaChannel(image,ActivateAlphaChannel);
+    (void) SetImageAlphaChannel(image,ActivateAlphaChannel,exception);
   return(status);
 }
 \f
@@ -2134,7 +2134,7 @@ MagickExport MagickBooleanType HaldClutImage(Image *image,
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   if (image->matte == MagickFalse)
-    (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+    (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
   /*
     Hald clut image.
   */

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 88cef6e8f80384f1f52da8c8b8661a70f701dfc1..207aa2301310b753b56482f309848eb71dc8cfd1 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -3848,7 +3848,7 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info,
       count=FormatMagickCaption(caption_image,annotate_info,MagickTrue,&metrics,
         &caption);
       status=SetImageExtent(caption_image,image->columns,(size_t)
-        ((count+1)*(metrics.ascent-metrics.descent)+0.5));
+        ((count+1)*(metrics.ascent-metrics.descent)+0.5),exception);
       if (status == MagickFalse)
         caption_image=DestroyImage(caption_image);
       else
@@ -3885,7 +3885,7 @@ MagickExport Image *PolaroidImage(const Image *image,const DrawInfo *draw_info,
       caption_image=DestroyImage(caption_image);
     }
   (void) QueryColorDatabase("none",&picture_image->background_color,exception);
-  (void) SetImageAlphaChannel(picture_image,OpaqueAlphaChannel);
+  (void) SetImageAlphaChannel(picture_image,OpaqueAlphaChannel,exception);
   rotate_image=RotateImage(picture_image,90.0,exception);
   picture_image=DestroyImage(picture_image);
   if (rotate_image == (Image *) NULL)
@@ -4164,7 +4164,7 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity,
   if (border_image == (Image *) NULL)
     return((Image *) NULL);
   if (border_image->matte == MagickFalse)
-    (void) SetImageAlphaChannel(border_image,OpaqueAlphaChannel);
+    (void) SetImageAlphaChannel(border_image,OpaqueAlphaChannel,exception);
   /*
     Shadow image.
   */

diff --git a/MagickCore/image.c b/MagickCore/image.c
index d2bec910f7b6ffeed850bd462c20ab9360498548..7b30771c8bd2fd6b98a16c82eae8e0e32b7d3585 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2395,7 +2395,7 @@ MagickExport MagickBooleanType SeparateImage(Image *image)
       }
   }
   image_view=DestroyCacheView(image_view);
-  (void) SetImageColorspace(image,RGBColorspace);
+  (void) SetImageColorspace(image,RGBColorspace,exception);
   return(status);
 }
 \f
@@ -2497,7 +2497,7 @@ MagickExport Image *SeparateImages(const Image *image,ExceptionInfo *exception)
 %  The format of the SetImageAlphaChannel method is:
 %
 %      MagickBooleanType SetImageAlphaChannel(Image *image,
-%        const AlphaChannelType alpha_type)
+%        const AlphaChannelType alpha_type,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -2508,13 +2508,19 @@ MagickExport Image *SeparateImages(const Image *image,ExceptionInfo *exception)
 %      OpaqueAlphaChannel, SetAlphaChannel, ShapeAlphaChannel, and
 %      TransparentAlphaChannel.
 %
+%    o exception: return any errors or warnings in this structure.
+%
+%
 */
 MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
-  const AlphaChannelType alpha_type)
+  const AlphaChannelType alpha_type,ExceptionInfo *exception)
 {
   MagickBooleanType
     status;
 
+  PixelPacket
+    pixel;
+
   assert(image != (Image *) NULL);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
@@ -2532,9 +2538,6 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
       CacheView
         *image_view;
 
-      ExceptionInfo
-        *exception;
-
       MagickBooleanType
         status;
 
@@ -2552,7 +2555,6 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
       */
       if (image->matte == MagickFalse)
         break;
-      exception=(&image->exception);
       if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
         break;
       GetPixelInfo(image,&background);
@@ -2662,7 +2664,9 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
     case UndefinedAlphaChannel:
       break;
   }
-  return(status);
+  if (status == MagickFalse)
+    return(status);
+  return(GetOneAuthenticPixel(image,0,0,&pixel,exception));
 }
 \f
 /*
@@ -2858,7 +2862,7 @@ MagickExport MagickBooleanType SetImageColor(Image *image,
 %  The format of the SetImageStorageClass method is:
 %
 %      MagickBooleanType SetImageStorageClass(Image *image,
-%        const ClassType storage_class)
+%        const ClassType storage_class,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -2946,7 +2950,7 @@ MagickExport MagickBooleanType SetImageClipMask(Image *image,
 %  The format of the SetImageExtent method is:
 %
 %      MagickBooleanType SetImageExtent(Image *image,const size_t columns,
-%        const size_t rows)
+%        const size_t rows,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -2956,15 +2960,20 @@ MagickExport MagickBooleanType SetImageClipMask(Image *image,
 %
 %    o rows:  The image height in pixels.
 %
+%    o exception: return any errors or warnings in this structure.
+%
 */
 MagickExport MagickBooleanType SetImageExtent(Image *image,const size_t columns,
-  const size_t rows)
+  const size_t rows,ExceptionInfo *exception)
 {
+  PixelPacket
+    pixel;
+
   if ((columns == 0) || (rows == 0))
     return(MagickFalse);
   image->columns=columns;
   image->rows=rows;
-  return(MagickTrue);
+  return(GetOneAuthenticPixel(image,0,0,&pixel,exception));
 }
 \f
 /*
@@ -3539,6 +3548,9 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type)
   const char
     *artifact;
 
+  ExceptionInfo
+    *exception;
+
   ImageInfo
     *image_info;
 
@@ -3558,6 +3570,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type)
   artifact=GetImageArtifact(image,"dither");
   if (artifact != (const char *) NULL)
     (void) SetImageOption(image_info,"dither",artifact);
+  exception=(&image->exception);
   switch (type)
   {
     case BilevelType:
@@ -3587,7 +3600,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type)
       if (IsImageGray(image,&image->exception) == MagickFalse)
         status=TransformImageColorspace(image,GRAYColorspace);
       if (image->matte == MagickFalse)
-        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
       break;
     }
     case PaletteType:
@@ -3609,7 +3622,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type)
       if (IsRGBColorspace(image->colorspace) == MagickFalse)
         status=TransformImageColorspace(image,RGBColorspace);
       if (image->matte == MagickFalse)
-        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
       PushPixelChannelMap(image,AlphaChannel);
       (void) BilevelImage(image,(double) QuantumRange/2.0);
       PopPixelChannelMap(image);
@@ -3623,7 +3636,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type)
       if (IsRGBColorspace(image->colorspace) == MagickFalse)
         status=TransformImageColorspace(image,RGBColorspace);
       if (image->matte == MagickFalse)
-        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
       quantize_info=AcquireQuantizeInfo(image_info);
       quantize_info->colorspace=TransparentColorspace;
       status=QuantizeImage(quantize_info,image);
@@ -3646,7 +3659,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type)
       if (image->storage_class != DirectClass)
         status=SetImageStorageClass(image,DirectClass,&image->exception);
       if (image->matte == MagickFalse)
-        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
       break;
     }
     case ColorSeparationType:
@@ -3673,7 +3686,7 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type)
       if (image->storage_class != DirectClass)
         status=SetImageStorageClass(image,DirectClass,&image->exception);
       if (image->matte == MagickFalse)
-        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
       break;
     }
     case OptimizeType:

diff --git a/MagickCore/image.h b/MagickCore/image.h
index 4043d6fa6d90ad5f8e0179af96ca7c6618914e70..928b78ad3108229abbbbe64abbf77163417fa406 100644 (file)
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -518,11 +518,11 @@ extern MagickExport MagickBooleanType
   ModifyImage(Image **,ExceptionInfo *),
   ResetImagePage(Image *,const char *),
   SeparateImage(Image *),
-  SetImageAlphaChannel(Image *,const AlphaChannelType),
+  SetImageAlphaChannel(Image *,const AlphaChannelType,ExceptionInfo *),
   SetImageBackgroundColor(Image *),
   SetImageClipMask(Image *,const Image *),
   SetImageColor(Image *,const PixelInfo *),
-  SetImageExtent(Image *,const size_t,const size_t),
+  SetImageExtent(Image *,const size_t,const size_t,ExceptionInfo *),
   SetImageInfo(ImageInfo *,const unsigned int,ExceptionInfo *),
   SetImageMask(Image *,const Image *),
   SetImageOpacity(Image *,const Quantum),

diff --git a/MagickCore/layer.c b/MagickCore/layer.c
index 2c90494e441056a009802da8d2d592ac783cf817..d1b2d43f47e319f604ff58935643404917a7106a 100644 (file)
--- a/MagickCore/layer.c
+++ b/MagickCore/layer.c
@@ -103,9 +103,9 @@ static void ClearBounds(Image *image,RectangleInfo *bounds)
 
   if (bounds->x < 0)
     return;
-  if (image->matte == MagickFalse)
-    (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
   exception=(&image->exception);
+  if (image->matte == MagickFalse)
+    (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
   for (y=0; y < (ssize_t) bounds->height; y++)
   {
     register ssize_t

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 500da0bb60145bfb7a8368d9346b13a533721997..f21ee5d2783f2222e69a0d5f8f583b4511126544 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -12,9 +12,7 @@
 /* #undef AUTOTRACE_DELEGATE */
 
 /* Define if coders and filters are to be built as modules. */
-#ifndef MAGICKCORE_BUILD_MODULES
-#define MAGICKCORE_BUILD_MODULES 1
-#endif
+/* #undef BUILD_MODULES */
 
 /* Define if you have the bzip2 library */
 #ifndef MAGICKCORE_BZLIB_DELEGATE
@@ -80,9 +78,7 @@
 #endif
 
 /* Define if you have FFTW library */
-#ifndef MAGICKCORE_FFTW_DELEGATE
-#define MAGICKCORE_FFTW_DELEGATE 1
-#endif
+/* #undef FFTW_DELEGATE */
 
 /* Location of filter modules */
 #ifndef MAGICKCORE_FILTER_PATH
@@ -436,15 +432,15 @@
 #endif
 
 /* Define if you have the <lcms2.h> header file. */
-/* #undef HAVE_LCMS2_H */
+#ifndef MAGICKCORE_HAVE_LCMS2_H
+#define MAGICKCORE_HAVE_LCMS2_H 1
+#endif
 
 /* Define if you have the <lcms2/lcms2.h> header file. */
 /* #undef HAVE_LCMS2_LCMS2_H */
 
 /* Define if you have the <lcms.h> header file. */
-#ifndef MAGICKCORE_HAVE_LCMS_H
-#define MAGICKCORE_HAVE_LCMS_H 1
-#endif
+/* #undef HAVE_LCMS_H */
 
 /* Define if you have the <lcms/lcms.h> header file. */
 /* #undef HAVE_LCMS_LCMS_H */
@@ -1167,9 +1163,7 @@
 #endif
 
 /* Define if you have JBIG library */
-#ifndef MAGICKCORE_JBIG_DELEGATE
-#define MAGICKCORE_JBIG_DELEGATE 1
-#endif
+/* #undef JBIG_DELEGATE */
 
 /* Define if you have JPEG version 2 "Jasper" library */
 #ifndef MAGICKCORE_JP2_DELEGATE
@@ -1198,9 +1192,7 @@
 #endif
 
 /* Define if you have LQR library */
-#ifndef MAGICKCORE_LQR_DELEGATE
-#define MAGICKCORE_LQR_DELEGATE 1
-#endif
+/* #undef LQR_DELEGATE */
 
 /* Define if using libltdl to support dynamically loadable modules */
 #ifndef MAGICKCORE_LTDL_DELEGATE
@@ -1212,7 +1204,7 @@
 
 /* Define to the system default library search path. */
 #ifndef MAGICKCORE_LT_DLSEARCH_PATH
-#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/xulrunner-2"
+#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
 #endif
 
 /* The archive extension */
@@ -1263,9 +1255,7 @@
 /* #undef NO_MINUS_C_MINUS_O */
 
 /* Define if you have OPENEXR library */
-#ifndef MAGICKCORE_OPENEXR_DELEGATE
-#define MAGICKCORE_OPENEXR_DELEGATE 1
-#endif
+/* #undef OPENEXR_DELEGATE */
 
 /* Define to the address where bug reports for this package should be sent. */
 #ifndef MAGICKCORE_PACKAGE_BUGREPORT
@@ -1320,9 +1310,7 @@
 #endif
 
 /* Define if you have RSVG library */
-#ifndef MAGICKCORE_RSVG_DELEGATE
-#define MAGICKCORE_RSVG_DELEGATE 1
-#endif
+/* #undef RSVG_DELEGATE */
 
 /* Define to the type of arg 1 for `select'. */
 #ifndef MAGICKCORE_SELECT_TYPE_ARG1
@@ -1459,9 +1447,7 @@
 
 
 /* Define if you have WEBP library */
-#ifndef MAGICKCORE_WEBP_DELEGATE
-#define MAGICKCORE_WEBP_DELEGATE 1
-#endif
+/* #undef WEBP_DELEGATE */
 
 /* Define to use the Windows GDI32 library */
 /* #undef WINGDI32_DELEGATE */
@@ -1470,9 +1456,7 @@
 /* #undef WITH_DMALLOC */
 
 /* Define if you have WMF library */
-#ifndef MAGICKCORE_WMF_DELEGATE
-#define MAGICKCORE_WMF_DELEGATE 1
-#endif
+/* #undef WMF_DELEGATE */
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */

diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index f3186952183b2bbaffd1cd5467fe705cdfd00fd2..0c76037bf67cfcaf96627ee1b5f1e56ef2300c34 100644 (file)
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -3863,9 +3863,11 @@ MagickExport Image *MorphologyApply(const Image *image,
 
       if ( method == VoronoiMorphology ) {
         /* Preserve the alpha channel of input image - but turned off */
-        (void) SetImageAlphaChannel(rslt_image, DeactivateAlphaChannel);
+        (void) SetImageAlphaChannel(rslt_image, DeactivateAlphaChannel,
+          exception);
         (void) CompositeImage(rslt_image, CopyOpacityCompositeOp, image, 0, 0);
-        (void) SetImageAlphaChannel(rslt_image, DeactivateAlphaChannel);
+        (void) SetImageAlphaChannel(rslt_image, DeactivateAlphaChannel,
+          exception);
       }
       goto exit_cleanup;
     }

diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index 9e21fdae03fcceb36fd6fa5341f1953228a841dd..129c5c85218944440524055781abf6e3586f9435 100644 (file)
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -173,14 +173,14 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   if (image->matte == MagickFalse)
-    (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+    (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
   /*
     Set floodfill state.
   */
   floodplane_image=CloneImage(image,0,0,MagickTrue,&image->exception);
   if (floodplane_image == (Image *) NULL)
     return(MagickFalse);
-  (void) SetImageAlphaChannel(floodplane_image,OpaqueAlphaChannel);
+  (void) SetImageAlphaChannel(floodplane_image,OpaqueAlphaChannel,exception);
   segment_stack=(SegmentInfo *) AcquireQuantumMemory(MaxStacksize,
     sizeof(*segment_stack));
   if (segment_stack == (SegmentInfo *) NULL)
@@ -906,7 +906,7 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image,
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   if (image->matte == MagickFalse)
-    (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+    (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
   /*
     Make image color transparent.
   */
@@ -1035,7 +1035,7 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image,
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   if (image->matte == MagickFalse)
-    (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+    (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
   /*
     Make image color transparent.
   */

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 4a1f60754c61381ee8594d94eca4fb622bdaacea..42d5bfbab0503dfe1870e4d50646fad8af64cf44 100644 (file)
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -1879,6 +1879,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
   if (quantum_map == (QuantumType *) NULL)
     ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
       image->filename);
+  exception=(&image->exception);
   for (i=0; i < (ssize_t) length; i++)
   {
     switch (map[i])
@@ -1900,7 +1901,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
       case 'c':
       {
         quantum_map[i]=CyanQuantum;
-        (void) SetImageColorspace(image,CMYKColorspace);
+        (void) SetImageColorspace(image,CMYKColorspace,exception);
         break;
       }
       case 'g':
@@ -1913,7 +1914,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
       case 'k':
       {
         quantum_map[i]=BlackQuantum;
-        (void) SetImageColorspace(image,CMYKColorspace);
+        (void) SetImageColorspace(image,CMYKColorspace,exception);
         break;
       }
       case 'I':
@@ -1926,7 +1927,7 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
       case 'M':
       {
         quantum_map[i]=MagentaQuantum;
-        (void) SetImageColorspace(image,CMYKColorspace);
+        (void) SetImageColorspace(image,CMYKColorspace,exception);
         break;
       }
       case 'O':
@@ -1952,24 +1953,23 @@ MagickExport MagickBooleanType ImportImagePixels(Image *image,
       case 'y':
       {
         quantum_map[i]=YellowQuantum;
-        (void) SetImageColorspace(image,CMYKColorspace);
+        (void) SetImageColorspace(image,CMYKColorspace,exception);
         break;
       }
       default:
       {
         quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
-        (void) ThrowMagickException(&image->exception,GetMagickModule(),
-          OptionError,"UnrecognizedPixelMap","`%s'",map);
+        (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+          "UnrecognizedPixelMap","`%s'",map);
         return(MagickFalse);
       }
     }
   }
-  if (SetImageStorageClass(image,DirectClass,&image->exception) == MagickFalse)
+  if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   /*
     Transfer the pixels from the pixel datarray to the image.
   */
-  exception=(&image->exception);
   switch (type)
   {
     case CharPixel:

diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index 844bed394b35bc3c22b68f989765f337c9215ed1..19f37a03657914152d1c509e942a9c1451c08ac9 100644 (file)
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -836,6 +836,9 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
   ThrowBinaryException(severity,tag,context); \
 }
 
+  ExceptionInfo
+    *exception;
+
   MagickBooleanType
     status;
 
@@ -847,6 +850,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(name != (const char *) NULL);
+  exception=(&image->exception);
   if ((datum == (const void *) NULL) || (length == 0))
     {
       char
@@ -928,9 +932,8 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
           return(MagickTrue);
         }
 #if !defined(MAGICKCORE_LCMS_DELEGATE)
-      (void) ThrowMagickException(&image->exception,GetMagickModule(),
-        MissingDelegateWarning,"DelegateLibrarySupportNotBuiltIn","`%s' (LCMS)",
-        image->filename);
+      (void) ThrowMagickException(GetMagickModule(),MissingDelegateWarning,
+        "DelegateLibrarySupportNotBuiltIn","`%s' (LCMS)",image->filename);
 #else
       {
         cmsHPROFILE
@@ -972,9 +975,6 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
               source_type,
               target_type;
 
-            ExceptionInfo
-              *exception;
-
             int
               intent;
 
@@ -995,7 +995,6 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
               **restrict source_pixels,
               **restrict target_pixels;
 
-            exception=(&image->exception);
             target_profile=(cmsHPROFILE) NULL;
             if (icc_profile != (StringInfo *) NULL)
               {
@@ -1198,7 +1197,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
                 return(MagickFalse);
               }
             if (target_colorspace == CMYKColorspace)
-              (void) SetImageColorspace(image,target_colorspace);
+              (void) SetImageColorspace(image,target_colorspace,exception);
             status=MagickTrue;
             progress=0;
             image_view=AcquireCacheView(image);
@@ -1286,7 +1285,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
                 }
             }
             image_view=DestroyCacheView(image_view);
-            (void) SetImageColorspace(image,target_colorspace);
+            (void) SetImageColorspace(image,target_colorspace,exception);
             switch (signature)
             {
               case cmsSigRgbData:

diff --git a/MagickCore/property.c b/MagickCore/property.c
index e7e4bb477424ce12548d50e4492cc918fe70f5f3..1ede01a323a03c3548d199a8aae10e5b689139f0 100644 (file)
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -3308,7 +3308,8 @@ MagickExport MagickBooleanType SetImageProperty(Image *image,
             value);
           if (colorspace < 0)
             break;
-          (void) SetImageColorspace(image,(ColorspaceType) colorspace);
+          (void) SetImageColorspace(image,(ColorspaceType) colorspace,
+            exception);
           break;
         }
       if (LocaleCompare(property,"compose") == 0)

diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 7dd0e73778913806ff280a42de4b59dcd34d9f75..c316e21d4abecd475127617d88fbfb54ae56e7ba 100644 (file)
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -3268,7 +3268,7 @@ MagickExport Image *ThumbnailImage(const Image *image,const size_t columns,
     return(thumbnail_image);
   (void) ParseAbsoluteGeometry("0x0+0+0",&thumbnail_image->page);
   if (thumbnail_image->matte == MagickFalse)
-    (void) SetImageAlphaChannel(thumbnail_image,OpaqueAlphaChannel);
+    (void) SetImageAlphaChannel(thumbnail_image,OpaqueAlphaChannel,exception);
   thumbnail_image->depth=8;
   thumbnail_image->interlace=NoInterlace;
   /*

diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index b2dc8e4c45ccbba5199ee4e4c38f52fb881d9eba..68e4f290d81daa508caf0ff8c5d2bbd27062680d 100644 (file)
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -1891,7 +1891,7 @@ MagickExport Image *RotateImage(const Image *image,const double degrees,
       return(integral_image);
     }
   if (integral_image->matte == MagickFalse)
-    (void) SetImageAlphaChannel(integral_image,OpaqueAlphaChannel);
+    (void) SetImageAlphaChannel(integral_image,OpaqueAlphaChannel,exception);
   /*
     Compute image size.
   */
@@ -2043,7 +2043,7 @@ MagickExport Image *ShearImage(const Image *image,const double x_shear,
       return(integral_image);
     }
   if (integral_image->matte == MagickFalse)
-    (void) SetImageAlphaChannel(integral_image,OpaqueAlphaChannel);
+    (void) SetImageAlphaChannel(integral_image,OpaqueAlphaChannel,exception);
   /*
     Compute image size.
   */
@@ -2067,7 +2067,7 @@ MagickExport Image *ShearImage(const Image *image,const double x_shear,
     Shear the image.
   */
   if (shear_image->matte == MagickFalse)
-    (void) SetImageAlphaChannel(shear_image,OpaqueAlphaChannel);
+    (void) SetImageAlphaChannel(shear_image,OpaqueAlphaChannel,exception);
   status=XShearImage(shear_image,shear.x,image->columns,image->rows,x_offset,
     (ssize_t) (shear_image->rows-image->rows)/2,exception);
   if (status == MagickFalse)

diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index cc03497dd91617e240c36dc7c6fd6b2282185b5c..0848029c30b6a741b520bca93bde7c90b9758c3f 100644 (file)
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -332,7 +332,7 @@ MagickExport Image *ConsolidateCMYKImages(const Image *images,
       break;
     if (SetImageStorageClass(cmyk_image,DirectClass,exception) == MagickFalse)
       break;
-    (void) SetImageColorspace(cmyk_image,CMYKColorspace);
+    (void) SetImageColorspace(cmyk_image,CMYKColorspace,exception);
     image_view=AcquireCacheView(images);
     cmyk_view=AcquireCacheView(cmyk_image);
     for (y=0; y < (ssize_t) images->rows; y++)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index ccf810685a0b727898e4cd4f734230f8fd7206e7..fdc2f1be9a390f5ff7b90ad2bc64823860483b66 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "exported"
+#define MagickSVNRevision  "4861"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  5,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  5
 #define MagickLibMinInterface  5
-#define MagickReleaseDate  "2011-08-04"
+#define MagickReleaseDate  "2011-08-05"
 #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 3ed737c225aa0f68c5d5742e35667122cf47cb94..f9369d7f765e6ec719639a27c0dce848b0bfa585 100644 (file)
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -8560,7 +8560,7 @@ WandExport MagickBooleanType MagickSetImageAlphaChannel(MagickWand *wand,
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
-  return(SetImageAlphaChannel(wand->images,alpha_type));
+  return(SetImageAlphaChannel(wand->images,alpha_type,&wand->images->exception));
 }
 \f
 /*
@@ -8887,7 +8887,7 @@ WandExport MagickBooleanType MagickSetImageColorspace(MagickWand *wand,
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
-  return(SetImageColorspace(wand->images,colorspace));
+  return(SetImageColorspace(wand->images,colorspace,&wand->images->exception));
 }
 \f
 /*
@@ -9155,7 +9155,7 @@ WandExport MagickBooleanType MagickSetImageExtent(MagickWand *wand,
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
-  return(SetImageExtent(wand->images,columns,rows));
+  return(SetImageExtent(wand->images,columns,rows,&wand->images->exception));
 }
 \f
 /*

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 45611694aa6a09dc8705082ff7359f66cdb92c0d..4062343072efb03ab73c0084490b55ac510fef6b 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -755,8 +755,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             (void) SyncImageSettings(mogrify_info,*image);
             alpha_type=(AlphaChannelType) ParseCommandOption(MagickAlphaOptions,
               MagickFalse,argv[i+1]);
-            (void) SetImageAlphaChannel(*image,alpha_type);
-            InheritException(exception,&(*image)->exception);
+            (void) SetImageAlphaChannel(*image,alpha_type,exception);
             break;
           }
         if (LocaleCompare("annotate",option+1) == 0)
@@ -2014,8 +2013,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
         if (LocaleCompare("matte",option+1) == 0)
           {
             (void) SetImageAlphaChannel(*image,(*option == '-') ?
-              SetAlphaChannel : DeactivateAlphaChannel );
-            InheritException(exception,&(*image)->exception);
+              SetAlphaChannel : DeactivateAlphaChannel,exception);
             break;
           }
         if (LocaleCompare("median",option+1) == 0)

diff --git a/PerlMagick/Makefile.nt b/PerlMagick/Makefile.nt
index ab3bc76bc0cb864f4f230b2a15bcfb3df2c01718..728d6ca3c4d819ec4b8df41c850479b4aca32dc6 100644 (file)
--- a/PerlMagick/Makefile.nt
+++ b/PerlMagick/Makefile.nt
@@ -38,7 +38,7 @@ WriteMakefile(
     'AUTHOR'    => 'ImageMagick Studio',
     'NAME'      => 'Image::Magick',
     'VERSION_FROM' => 'Magick.pm', # finds $VERSION
-    'LIBS'      => ['-L..\VisualMagick\lib -L..\VisualMagick\bin -lCORE_RL_magick_.lib -lCORE_DB_magick_.lib'],
+    'LIBS'      => ['-L..\VisualMagick\lib -L..\VisualMagick\bin -lCORE_RL_MagickCore_.lib -lCORE_DB_MagickCore_.lib'],
     'DEFINE'    => '-D_VISUALC_ -D_WINDOWS',     # e.g., '-DHAVE_SOMETHING' 
     'INC'       => '-I.. -I..\xlib\include',
     'BINARY_LOCATION'  => 'x86/Image-Magick.tar.gz',

diff --git a/coders/bgr.c b/coders/bgr.c
index c882751be199590e6b2ee388cb26c6fe2f961c5d..2d14405454178fef572f5de33c10ae470a97685e 100644 (file)
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -1106,7 +1106,7 @@ static MagickBooleanType WriteBGRImage(const ImageInfo *image_info,Image *image)
       (void) TransformImageColorspace(image,RGBColorspace);
     if ((LocaleCompare(image_info->magick,"BGRA") == 0) &&
         (image->matte == MagickFalse))
-      (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+      (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,&image->exception);
     quantum_info=AcquireQuantumInfo(image_info,image);
     if (quantum_info == (QuantumInfo *) NULL)
       ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");

diff --git a/coders/cmyk.c b/coders/cmyk.c
index d736168871a206708907d8adecf88c41d01be518..2d15985938d3255c279ff75b72173de91723b18e 100644 (file)
--- a/coders/cmyk.c
+++ b/coders/cmyk.c
@@ -1226,7 +1226,7 @@ static MagickBooleanType WriteCMYKImage(const ImageInfo *image_info,
       (void) TransformImageColorspace(image,CMYKColorspace);
     if ((LocaleCompare(image_info->magick,"CMYKA") == 0) &&
         (image->matte == MagickFalse))
-      (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+      (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,&image->exception);
     quantum_info=AcquireQuantumInfo(image_info,image);
     if (quantum_info == (QuantumInfo *) NULL)
       ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");

diff --git a/coders/miff.c b/coders/miff.c
index 4e4197581108f52a0e7061c5d6e19604279ff48d..7c7918b2cdbfdb9e4dec55ed504e9669d99bf3fc 100644 (file)
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -1885,8 +1885,8 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
       (void) SetImageStorageClass(image,DirectClass,&image->exception);
     if (IsImageGray(image,&image->exception) != MagickFalse)
       {
-        image->storage_class=DirectClass;
-        (void) SetImageColorspace(image,GRAYColorspace);
+        (void) SetImageStorageClass(image,DirectClass,&image->exception);
+        (void) SetImageColorspace(image,GRAYColorspace,&image->exception);
       }
     compression=image->compression;
     if (image_info->compression != UndefinedCompression)

diff --git a/coders/msl.c b/coders/msl.c
index abc61d890d916a0bf42c29a96474b3ae53ffdc82..9818d5225f940394a15ba75e30bcd8fcdfc1da3d 100644 (file)
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -7848,7 +7848,8 @@ static MagickBooleanType SetMSLAttributes(MSLInfo *msl_info,const char *keyword,
           if (alpha < 0)
             ThrowMSLException(OptionError,"UnrecognizedType",value);
           if (image != (Image *) NULL)
-            (void) SetImageAlphaChannel(image,(AlphaChannelType) alpha);
+            (void) SetImageAlphaChannel(image,(AlphaChannelType) alpha,
+              exception);
           break;
         }
       if (LocaleCompare(keyword,"antialias") == 0)

diff --git a/coders/pict.c b/coders/pict.c
index c2e3776fb4c29136f07497186addd826c2c6bf35..afa69bdc99185893d37597c4cd6646154b8d9d55 100644 (file)
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -1381,7 +1381,7 @@ static Image *ReadPICTImage(const ImageInfo *image_info,
           (double) MagickMax(image->rows,tile_image->rows));
         (void) SetImageExtent(image,
           MagickMax(image->columns,tile_image->columns),
-          MagickMax(image->rows,tile_image->rows));
+          MagickMax(image->rows,tile_image->rows),exception);
         if (IsRGBColorspace(image->colorspace) == MagickFalse)
           (void) TransformImageColorspace(image,tile_image->colorspace);
         (void) CompositeImage(image,CopyCompositeOp,tile_image,frame.left,

diff --git a/coders/plasma.c b/coders/plasma.c
index 411398c039086a7bd31ac9c8259c25ba4cc3c0b6..1f5cb4a9864ad728ed23686eb6b3f6b78286ca5a 100644 (file)
--- a/coders/plasma.c
+++ b/coders/plasma.c
@@ -221,7 +221,7 @@ static Image *ReadPlasmaImage(const ImageInfo *image_info,
     if (status == MagickFalse)
       break;
   }
-  (void) SetImageAlphaChannel(image,DeactivateAlphaChannel);
+  (void) SetImageAlphaChannel(image,DeactivateAlphaChannel,exception);
   return(GetFirstImageInList(image));
 }
 \f

diff --git a/coders/rgb.c b/coders/rgb.c
index 8f9e990867ca13f1619c9ca3bae76530d597da84..dcf77239968a7d1b735b22594676934225c26a49 100644 (file)
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -1134,7 +1134,7 @@ static MagickBooleanType WriteRGBImage(const ImageInfo *image_info,
       (void) TransformImageColorspace(image,RGBColorspace);
     if ((LocaleCompare(image_info->magick,"RGBA") == 0) &&
         (image->matte == MagickFalse))
-      (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+      (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,&image->exception);
     quantum_info=AcquireQuantumInfo(image_info,image);
     if (quantum_info == (QuantumInfo *) NULL)
       ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");

diff --git a/coders/ycbcr.c b/coders/ycbcr.c
index 305291da2336338e672e30843aaed1f4a15dd698..03cb42550b1e2ba8dfb8ac95b9903a93ab5fc13b 100644 (file)
--- a/coders/ycbcr.c
+++ b/coders/ycbcr.c
@@ -1014,7 +1014,7 @@ static MagickBooleanType WriteYCBCRImage(const ImageInfo *image_info,
       (void) TransformImageColorspace(image,YCbCrColorspace);
     if ((LocaleCompare(image_info->magick,"YCbCrA") == 0) &&
         (image->matte == MagickFalse))
-      (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+      (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,&image->exception);
     quantum_info=AcquireQuantumInfo(image_info,image);
     if (quantum_info == (QuantumInfo *) NULL)
       ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");

diff --git a/config/configure.xml b/config/configure.xml
index fa5b47441470cb1ee51227acc2939d4fb0ac1f9d..2033e0879d357c948a15f857cd877166e1d08602 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -11,7 +11,7 @@
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
   <configure name="SVN_REVISION" value="4861" />
-  <configure name="RELEASE_DATE" value="2011-08-02"/>
+  <configure name="RELEASE_DATE" value="2011-08-05"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>