(no commit message)

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 6b782521927556b47db58701585d7333af4ba798..e80f2c5f53a90de1a7155345b26dd2470a067cc5 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -4106,7 +4106,11 @@ std::string Magick::Image::view ( void ) const
 void Magick::Image::virtualPixelMethod ( const VirtualPixelMethod virtual_pixel_method_ )
 {
   modifyImage();
-  SetImageVirtualPixelMethod( image(), virtual_pixel_method_ );
+  ExceptionInfo exceptionInfo;
+  GetExceptionInfo( &exceptionInfo );
+  SetImageVirtualPixelMethod( image(), virtual_pixel_method_, &exceptionInfo );
+  throwException( exceptionInfo );
+  (void) DestroyExceptionInfo( &exceptionInfo );
 }
 Magick::VirtualPixelMethod Magick::Image::virtualPixelMethod ( void ) const
 {

diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
index 58bebe83edbd838f8a3d40388cd0e7d47e3d6ce1..9cb0379b10053c8c72efbdef89e214f994aa7a56 100644 (file)
--- a/MagickCore/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -249,7 +249,7 @@ extern MagickPrivate size_t
 
 extern MagickPrivate VirtualPixelMethod
   GetPixelCacheVirtualMethod(const Image *),
-  SetPixelCacheVirtualMethod(const Image *,const VirtualPixelMethod);
+  SetPixelCacheVirtualMethod(Image *,const VirtualPixelMethod,ExceptionInfo *);
 
 extern MagickPrivate void
   CacheComponentTerminus(void),

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 4b4ff9a9118b1a18b948213bc5b1a3b7351668a9..4cc6537abfe351e8faf642328c08f557987414b0 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -4873,8 +4873,8 @@ static Quantum *SetPixelCacheNexusPixels(const Image *image,
 %
 %  The format of the SetPixelCacheVirtualMethod() method is:
 %
-%      VirtualPixelMethod SetPixelCacheVirtualMethod(const Image *image,
-%        const VirtualPixelMethod virtual_pixel_method)
+%      VirtualPixelMethod SetPixelCacheVirtualMethod(Image *image,
+%        const VirtualPixelMethod virtual_pixel_method,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -4882,9 +4882,11 @@ static Quantum *SetPixelCacheNexusPixels(const Image *image,
 %
 %    o virtual_pixel_method: choose the type of virtual pixel.
 %
+%    o exception: return any errors or warnings in this structure.
+%
 */
-MagickPrivate VirtualPixelMethod SetPixelCacheVirtualMethod(const Image *image,
-  const VirtualPixelMethod virtual_pixel_method)
+MagickPrivate VirtualPixelMethod SetPixelCacheVirtualMethod(Image *image,
+  const VirtualPixelMethod virtual_pixel_method,ExceptionInfo *exception)
 {
   CacheInfo
     *cache_info;
@@ -4901,6 +4903,24 @@ MagickPrivate VirtualPixelMethod SetPixelCacheVirtualMethod(const Image *image,
   assert(cache_info->signature == MagickSignature);
   method=cache_info->virtual_pixel_method;
   cache_info->virtual_pixel_method=virtual_pixel_method;
+  switch (virtual_pixel_method)
+  {
+    case BackgroundVirtualPixelMethod:
+    {
+      if ((image->background_color.matte != MagickFalse) &&
+          (image->matte == MagickFalse))
+        (void) SetImageAlpha(image,OpaqueAlpha,exception);
+      break;
+    }
+    case TransparentVirtualPixelMethod:
+    {
+      if (image->matte == MagickFalse)
+        (void) SetImageAlpha(image,OpaqueAlpha,exception);
+      break;
+    }
+    default:
+      break;
+  }
   return(method);
 }
 \f

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 7d62cefda18cbde4d04e03a0bc8add652444f5df..ee6755fe829b5a399cd62644117f6551b1373c15 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -2314,7 +2314,8 @@ MagickExport MagickBooleanType TextureImage(Image *image,
   assert(image->signature == MagickSignature);
   if (texture_image == (const Image *) NULL)
     return(MagickFalse);
-  (void) SetImageVirtualPixelMethod(texture_image,TileVirtualPixelMethod);
+  (void) SetImageVirtualPixelMethod(texture_image,TileVirtualPixelMethod,
+    exception);
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   status=MagickTrue;

diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index 0fd671a970469270268671466d2babb30f79b411..91cf659b27d1ee1b650594da79029e2d54f9e8c8 100644 (file)
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -1487,7 +1487,6 @@ MagickExport Image *DistortResizeImage(const Image *image,
     return((Image *) NULL);
   /* Do not short-circuit this resize if final image size is unchanged */
 
-  (void) SetImageVirtualPixelMethod(image,TransparentVirtualPixelMethod);
 
   (void) ResetMagickMemory(distort_args,0,12*sizeof(double));
   distort_args[4]=(double) image->columns;
@@ -1500,7 +1499,8 @@ MagickExport Image *DistortResizeImage(const Image *image,
   tmp_image=CloneImage(image,0,0,MagickTrue,exception);
   if ( tmp_image == (Image *) NULL )
     return((Image *) NULL);
-  (void) SetImageVirtualPixelMethod(tmp_image,TransparentVirtualPixelMethod);
+  (void) SetImageVirtualPixelMethod(tmp_image,TransparentVirtualPixelMethod,
+    exception);
 
   if (image->matte == MagickFalse)
     {
@@ -1542,7 +1542,7 @@ MagickExport Image *DistortResizeImage(const Image *image,
       if ( tmp_image == (Image *) NULL )
         return((Image *) NULL);
       (void) SetImageVirtualPixelMethod(tmp_image,
-        TransparentVirtualPixelMethod);
+        TransparentVirtualPixelMethod,exception);
       resize_image=DistortImage(tmp_image,AffineDistortion,12,distort_args,
         MagickTrue,exception),
       tmp_image=DestroyImage(tmp_image);
@@ -1560,7 +1560,7 @@ MagickExport Image *DistortResizeImage(const Image *image,
         0,0,exception);
       resize_alpha=DestroyImage(resize_alpha);
     }
-  (void) SetImageVirtualPixelMethod(resize_image,vp_save);
+  (void) SetImageVirtualPixelMethod(resize_image,vp_save,exception);
 
   /*
     Clean up the results of the Distortion
@@ -2824,10 +2824,8 @@ MagickExport Image *RotateImage(const Image *image,const double degrees,
   distort_image=CloneImage(image,0,0,MagickTrue,exception);
   if (distort_image == (Image *) NULL)
     return((Image *) NULL);
-  if ((distort_image->background_color.matte != MagickFalse) &&
-      (distort_image->matte == MagickFalse))
-    (void) SetImageAlpha(distort_image,OpaqueAlpha,exception);
-  (void) SetImageVirtualPixelMethod(distort_image,BackgroundVirtualPixelMethod);
+  (void) SetImageVirtualPixelMethod(distort_image,BackgroundVirtualPixelMethod,
+    exception);
   rotate_image=DistortImage(distort_image,ScaleRotateTranslateDistortion,1,
     &degrees,MagickTrue,exception);
   distort_image=DestroyImage(distort_image);

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 62529eed8d006f3a013f4c8bbb5e99d6fe10714b..eeffe59c2e8933d48909282ba4ace3026872559f 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -4301,7 +4301,8 @@ MagickExport Image *ShadowImage(const Image *image,const double alpha,
   clone_image=CloneImage(image,0,0,MagickTrue,exception);
   if (clone_image == (Image *) NULL)
     return((Image *) NULL);
-  (void) SetImageVirtualPixelMethod(clone_image,EdgeVirtualPixelMethod);
+  (void) SetImageVirtualPixelMethod(clone_image,EdgeVirtualPixelMethod,
+    exception);
   border_info.width=(size_t) floor(2.0*sigma+0.5);
   border_info.height=(size_t) floor(2.0*sigma+0.5);
   border_info.x=0;

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 31c72f545ef555dad17873a3055ce997d2fa2447..6983cf243eeb34d7dde3db5f7bc60b0c5859948a 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -3676,8 +3676,8 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
 %
 %  The format of the SetImageVirtualPixelMethod() method is:
 %
-%      VirtualPixelMethod SetImageVirtualPixelMethod(const Image *image,
-%        const VirtualPixelMethod virtual_pixel_method)
+%      VirtualPixelMethod SetImageVirtualPixelMethod(Image *image,
+%        const VirtualPixelMethod virtual_pixel_method,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
 %
@@ -3685,15 +3685,17 @@ MagickExport MagickBooleanType SetImageType(Image *image,const ImageType type,
 %
 %    o virtual_pixel_method: choose the type of virtual pixel.
 %
+%    o exception: return any errors or warnings in this structure.
+%
 */
-MagickExport VirtualPixelMethod SetImageVirtualPixelMethod(const Image *image,
-  const VirtualPixelMethod virtual_pixel_method)
+MagickExport VirtualPixelMethod SetImageVirtualPixelMethod(Image *image,
+  const VirtualPixelMethod virtual_pixel_method,ExceptionInfo *exception)
 {
   assert(image != (const Image *) NULL);
   assert(image->signature == MagickSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
-  return(SetPixelCacheVirtualMethod(image,virtual_pixel_method));
+  return(SetPixelCacheVirtualMethod(image,virtual_pixel_method,exception));
 }
 \f
 /*
@@ -4401,8 +4403,9 @@ MagickExport MagickBooleanType SyncImageSettings(const ImageInfo *image_info,
     }
   option=GetImageOption(image_info,"virtual-pixel");
   if (option != (const char *) NULL)
-    (void) SetImageVirtualPixelMethod(image, (VirtualPixelMethod)
-         ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,option));
+    (void) SetImageVirtualPixelMethod(image,(VirtualPixelMethod)
+      ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,option),
+      exception);
   option=GetImageOption(image_info,"white-point");
   if (option != (const char *) NULL)
     {

diff --git a/MagickCore/image.h b/MagickCore/image.h
index 6e505d0025d9d5acc1ba805cca734d8eeb4620f9..d7c2008dca6701d029d45c5d31d8ac45c564fd7c 100644 (file)
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -537,7 +537,7 @@ extern MagickExport ssize_t
 
 extern MagickExport VirtualPixelMethod
   GetImageVirtualPixelMethod(const Image *),
-  SetImageVirtualPixelMethod(const Image *,const VirtualPixelMethod);
+  SetImageVirtualPixelMethod(Image *,const VirtualPixelMethod,ExceptionInfo *);
 
 extern MagickExport void
   AcquireNextImage(const ImageInfo *,Image *,ExceptionInfo *),

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 3db76f669fa1b245134c683f8140bc5fe0ec78a2..315b22993de3903edd3ae7168a035145da2317ea 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -12,7 +12,9 @@
 /* #undef AUTOTRACE_DELEGATE */
 
 /* Define if coders and filters are to be built as modules. */
-/* #undef BUILD_MODULES */
+#ifndef MAGICKCORE_BUILD_MODULES
+#define MAGICKCORE_BUILD_MODULES 1
+#endif
 
 /* Define if you have the bzip2 library */
 #ifndef MAGICKCORE_BZLIB_DELEGATE
@@ -219,7 +221,9 @@
 #endif
 
 /* Define to 1 if you have the <CL/cl.h> header file. */
-/* #undef HAVE_CL_CL_H */
+#ifndef MAGICKCORE_HAVE_CL_CL_H
+#define MAGICKCORE_HAVE_CL_CL_H 1
+#endif
 
 /* Define to 1 if you have the <complex.h> header file. */
 #ifndef MAGICKCORE_HAVE_COMPLEX_H
@@ -1188,7 +1192,9 @@
 #endif
 
 /* Define if you have JBIG library */
-/* #undef JBIG_DELEGATE */
+#ifndef MAGICKCORE_JBIG_DELEGATE
+#define MAGICKCORE_JBIG_DELEGATE 1
+#endif
 
 /* Define if you have JPEG version 2 "Jasper" library */
 #ifndef MAGICKCORE_JP2_DELEGATE
@@ -1229,7 +1235,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/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/tracker-0.12:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
+#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/alliance/lib:/usr/lib64/atlas:/usr/lib64/freetype-freeworld:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/kicad:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mpich2/lib/:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/openmotif:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib64/tracker-0.12:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
 #endif
 
 /* The archive extension */
@@ -1283,7 +1289,9 @@
 /* #undef NO_MINUS_C_MINUS_O */
 
 /* Define if you have OPENEXR library */
-/* #undef OPENEXR_DELEGATE */
+#ifndef MAGICKCORE_OPENEXR_DELEGATE
+#define MAGICKCORE_OPENEXR_DELEGATE 1
+#endif
 
 /* Name of package */
 #ifndef MAGICKCORE_PACKAGE
@@ -1353,7 +1361,9 @@
 #endif
 
 /* Define if you have RSVG library */
-/* #undef RSVG_DELEGATE */
+#ifndef MAGICKCORE_RSVG_DELEGATE
+#define MAGICKCORE_RSVG_DELEGATE 1
+#endif
 
 /* Define to the type of arg 1 for `select'. */
 #ifndef MAGICKCORE_SELECT_TYPE_ARG1
@@ -1581,7 +1591,9 @@
 /* #undef _MINIX */
 
 /* Define this for the OpenCL Accelerator */
-/* #undef _OPENCL */
+#ifndef MAGICKCORE__OPENCL
+#define MAGICKCORE__OPENCL 1
+#endif
 
 /* Define to 2 if the system does not provide POSIX.1 features except with
    this defined. */

diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index c22e8aaa910fbbd8327c547065059e38ea308395..024de5c5437f5f8bcd93b6d6808cde2323b27417 100644 (file)
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -881,7 +881,8 @@ MagickExport Image *DeskewImage(const Image *image,const double threshold,
   clone_image=CloneImage(image,0,0,MagickTrue,exception);
   if (clone_image == (Image *) NULL)
     return((Image *) NULL);
-  (void) SetImageVirtualPixelMethod(clone_image,BackgroundVirtualPixelMethod);
+  (void) SetImageVirtualPixelMethod(clone_image,BackgroundVirtualPixelMethod,
+    exception);
   degrees=RadiansToDegrees(-atan((double) skew/width/8));
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TransformEvent,GetMagickModule(),

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 345ffb6f02a71972c753dd26c38b56375cdf454a..e41e724c055e06e1c708f99cc96a08a11486d915 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "6720"
+#define MagickSVNRevision  "exported"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-02-06"
+#define MagickReleaseDate  "2012-02-07"
 #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 989821825b9f672711f9b61038bf789314025830..fbb9533c4534cc0161bbfbf727d1b7de2e637fd4 100644 (file)
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -10147,7 +10147,7 @@ WandExport VirtualPixelMethod MagickSetImageVirtualPixelMethod(MagickWand *wand,
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   if (wand->images == (Image *) NULL)
     return(UndefinedVirtualPixelMethod);
-  return(SetImageVirtualPixelMethod(wand->images,method));
+  return(SetImageVirtualPixelMethod(wand->images,method,wand->exception));
 }
 \f
 /*

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 0a450bedec5a529e78a7ed26c15cc5c3ad921371..5b2e4f3d4f98aa93b57c24f8cfcd95165d8203cd 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -3130,12 +3130,12 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             if (*option == '+')
               {
                 (void) SetImageVirtualPixelMethod(*image,
-                  UndefinedVirtualPixelMethod);
+                  UndefinedVirtualPixelMethod,exception);
                 break;
               }
             (void) SetImageVirtualPixelMethod(*image,(VirtualPixelMethod)
               ParseCommandOption(MagickVirtualPixelOptions,MagickFalse,
-              argv[i+1]));
+              argv[i+1]),exception);
             break;
           }
         break;

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 5cc09da8969cb2df7603f05f61bbaa4f5986bc50..b6708675d049ceb59c76630abbc11947de74848c 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -2192,7 +2192,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image,
               break;
             }
           for ( ; image; image=image->next)
-            SetImageVirtualPixelMethod(image,(VirtualPixelMethod) sp);
+            SetImageVirtualPixelMethod(image,(VirtualPixelMethod) sp,exception);
           break;
         }
       if (info)
@@ -7824,8 +7824,13 @@ Mogrify(ref,...)
           if (attribute_flag[0] == 0)
             argument_list[0].real_reference=90.0;
           if (attribute_flag[1] != 0)
-            QueryColorCompliance(argument_list[1].string_reference,
-              AllCompliance,&image->background_color,exception);
+            {
+              QueryColorCompliance(argument_list[1].string_reference,
+                AllCompliance,&image->background_color,exception);
+              if ((image->background_color.matte != MagickFalse) &&
+                  (image->matte == MagickFalse))
+                (void) SetImageAlpha(image,OpaqueAlpha,exception);
+            }
           image=RotateImage(image,argument_list[0].real_reference,exception);
           break;
         }
@@ -10384,12 +10389,13 @@ Mogrify(ref,...)
           virtual_pixel=UndefinedVirtualPixelMethod;
           if (attribute_flag[2] != 0)
             virtual_pixel=SetImageVirtualPixelMethod(image,(VirtualPixelMethod)
-              argument_list[2].integer_reference);
+              argument_list[2].integer_reference,exception);
           image=DistortImage(image,method,number_coordinates,coordinates,
             argument_list[3].integer_reference != 0 ? MagickTrue : MagickFalse,
             exception);
           if ((attribute_flag[2] != 0) && (image != (Image *) NULL))
-            virtual_pixel=SetImageVirtualPixelMethod(image,virtual_pixel);
+            virtual_pixel=SetImageVirtualPixelMethod(image,virtual_pixel,
+              exception);
           coordinates=(double *) RelinquishMagickMemory(coordinates);
           break;
         }
@@ -10517,7 +10523,7 @@ Mogrify(ref,...)
           virtual_pixel=UndefinedVirtualPixelMethod;
           if (attribute_flag[2] != 0)
             virtual_pixel=SetImageVirtualPixelMethod(image,(VirtualPixelMethod)
-              argument_list[2].integer_reference);
+              argument_list[2].integer_reference,exception);
           if (attribute_flag[3] != 0)
             channel=(ChannelType) argument_list[3].integer_reference;
           channel_mask=SetPixelChannelMask(image,channel);
@@ -10526,7 +10532,8 @@ Mogrify(ref,...)
           if (image != (Image *) NULL)
             (void) SetPixelChannelMask(image,channel_mask);
           if ((attribute_flag[2] != 0) && (image != (Image *) NULL))
-            virtual_pixel=SetImageVirtualPixelMethod(image,virtual_pixel);
+            virtual_pixel=SetImageVirtualPixelMethod(image,virtual_pixel,
+              exception);
           coordinates=(double *) RelinquishMagickMemory(coordinates);
           break;
         }
@@ -10567,11 +10574,12 @@ Mogrify(ref,...)
           virtual_pixel=UndefinedVirtualPixelMethod;
           if (attribute_flag[2] != 0)
             virtual_pixel=SetImageVirtualPixelMethod(image,(VirtualPixelMethod)
-              argument_list[2].integer_reference);
+              argument_list[2].integer_reference,exception);
           (void) FunctionImage(image,function,number_parameters,parameters,
             exception);
           if ((attribute_flag[2] != 0) && (image != (Image *) NULL))
-            virtual_pixel=SetImageVirtualPixelMethod(image,virtual_pixel);
+            virtual_pixel=SetImageVirtualPixelMethod(image,virtual_pixel,
+              exception);
           parameters=(double *) RelinquishMagickMemory(parameters);
           break;
         }

diff --git a/coders/bgr.c b/coders/bgr.c
index 32c16f816652b183ca81f7ee5df1e35af2e7e1c7..40c70b9694bbb809a5f69750a58c8858a5313d83 100644 (file)
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -159,7 +159,8 @@ static Image *ReadBGRImage(const ImageInfo *image_info,
   */
   canvas_image=CloneImage(image,image->extract_info.width,1,MagickFalse,
     exception);
-  (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod);
+  (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod,
+    exception);
   quantum_info=AcquireQuantumInfo(image_info,canvas_image);
   if (quantum_info == (QuantumInfo *) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");

diff --git a/coders/cmyk.c b/coders/cmyk.c
index 760a2060db4e84e8df37a0224d73548c59fb4b0b..583b93cea8cdddee53e619dd864d03abbb3fe072 100644 (file)
--- a/coders/cmyk.c
+++ b/coders/cmyk.c
@@ -158,7 +158,8 @@ static Image *ReadCMYKImage(const ImageInfo *image_info,
   */
   canvas_image=CloneImage(image,image->extract_info.width,1,MagickFalse,
     exception);
-  (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod);
+  (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod,
+    exception);
   quantum_info=AcquireQuantumInfo(image_info,canvas_image);
   if (quantum_info == (QuantumInfo *) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");

diff --git a/coders/gray.c b/coders/gray.c
index 25a728e980f630aa385e58723634e8ca72c3bd7f..5223098ef40141583ffc3be6bf8db0dddbf55aa4 100644 (file)
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -153,7 +153,8 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
   image->colorspace=GRAYColorspace;
   canvas_image=CloneImage(image,image->extract_info.width,1,MagickFalse,
     exception);
-  (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod);
+  (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod,
+    exception);
   quantum_type=GrayQuantum;
   quantum_info=AcquireQuantumInfo(image_info,canvas_image);
   if (quantum_info == (QuantumInfo *) NULL)

diff --git a/coders/raw.c b/coders/raw.c
index c5f2dd07f13cade9c0bb17f340213d0260491d98..aeedcfb4495d11e791177641596ca50e4cfc3696 100644 (file)
--- a/coders/raw.c
+++ b/coders/raw.c
@@ -149,7 +149,8 @@ static Image *ReadRAWImage(const ImageInfo *image_info,ExceptionInfo *exception)
   */
   canvas_image=CloneImage(image,image->extract_info.width,1,MagickFalse,
     exception);
-  (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod);
+  (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod,
+    exception);
   quantum_type=GrayQuantum;
   quantum_info=AcquireQuantumInfo(image_info,canvas_image);
   if (quantum_info == (QuantumInfo *) NULL)

diff --git a/coders/rgb.c b/coders/rgb.c
index 4e8de18c31c6085c47609a61d5f07ff8a88ce2aa..0ab2a35895fd04a72e0aa748870f9d24c63ee769 100644 (file)
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -159,7 +159,8 @@ static Image *ReadRGBImage(const ImageInfo *image_info,
   */
   canvas_image=CloneImage(image,image->extract_info.width,1,MagickFalse,
     exception);
-  (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod);
+  (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod,
+    exception);
   quantum_info=AcquireQuantumInfo(image_info,canvas_image);
   if (quantum_info == (QuantumInfo *) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");

diff --git a/coders/ycbcr.c b/coders/ycbcr.c
index b2b40ec610620e64e1bd49ae70ee5f2da40a4961..a3f063b61fd3dd2efdde13352eb402bd86d9273e 100644 (file)
--- a/coders/ycbcr.c
+++ b/coders/ycbcr.c
@@ -165,7 +165,8 @@ static Image *ReadYCBCRImage(const ImageInfo *image_info,
   */
   canvas_image=CloneImage(image,image->extract_info.width,1,MagickFalse,
     exception);
-  (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod);
+  (void) SetImageVirtualPixelMethod(canvas_image,BlackVirtualPixelMethod,
+    exception);
   quantum_info=AcquireQuantumInfo(image_info,canvas_image);
   if (quantum_info == (QuantumInfo *) NULL)
     ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");