commit 46ff2676b1044ea4101ac7a59b83289cd8f6cfda
author cristy <urban-warrior@git.imagemagick.org> Fri Dec 14 15:32:26 2012 +0000
committer cristy <urban-warrior@git.imagemagick.org> Fri Dec 14 15:32:26 2012 +0000
tree fd004ad9790d03f8c6b5ae59c4b52df724ad3969
parent a86d361dd74f74992cc2d8ca4501287f61e82428

MagickWand/magick-image.c

diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 23d6d66..de5f5af 100644
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -5205,7 +5205,7 @@
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
-  image_view=AcquireVirtualCacheView(wand->images);
+  image_view=AcquireVirtualCacheView(wand->images,wand->exception);
   p=GetCacheViewVirtualPixels(image_view,x,y,1,1,wand->exception);
   if (p == (const Quantum *) NULL)
     {

MagickWand/mogrify.c

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 03ef76a..74dfed2 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -1112,7 +1112,7 @@
               break;
             if (SetImageStorageClass(mask_image,DirectClass,exception) == MagickFalse)
               return(MagickFalse);
-            mask_view=AcquireAuthenticCacheView(mask_image);
+            mask_view=AcquireAuthenticCacheView(mask_image,exception);
             for (y=0; y < (ssize_t) mask_image->rows; y++)
             {
               q=GetCacheViewAuthenticPixels(mask_view,0,y,mask_image->columns,1,

MagickWand/operation.c

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index a087790..9d75c3b 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -2004,7 +2004,7 @@
             break;
           /* Create a write mask from cli_wand mask image */
           /* FUTURE: use Alpha operations instead and create a Grey Image */
-          mask_view=AcquireAuthenticCacheView(mask_image);
+          mask_view=AcquireAuthenticCacheView(mask_image,_exception);
           for (y=0; y < (ssize_t) mask_image->rows; y++)
           {
             q=GetCacheViewAuthenticPixels(mask_view,0,y,mask_image->columns,1,

MagickWand/pixel-iterator.c

diff --git a/MagickWand/pixel-iterator.c b/MagickWand/pixel-iterator.c
index 14732cc..e15128d 100644
--- a/MagickWand/pixel-iterator.c
+++ b/MagickWand/pixel-iterator.c
@@ -314,7 +314,7 @@
   if (image == (Image *) NULL)
     return((PixelIterator *) NULL);
   exception=AcquireExceptionInfo();
-  view=AcquireVirtualCacheView(image);
+  view=AcquireVirtualCacheView(image,exception);
   if (view == (CacheView *) NULL)
     return((PixelIterator *) NULL);
   iterator=(PixelIterator *) AcquireMagickMemory(sizeof(*iterator));
@@ -433,7 +433,7 @@
   if (image == (Image *) NULL)
     return((PixelIterator *) NULL);
   exception=AcquireExceptionInfo();
-  view=AcquireVirtualCacheView(image);
+  view=AcquireVirtualCacheView(image,exception);
   if (view == (CacheView *) NULL)
     return((PixelIterator *) NULL);
   iterator=(PixelIterator *) AcquireMagickMemory(sizeof(*iterator));

MagickWand/wand-view.c

diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c
index 96a8a5a..f854d6a 100644
--- a/MagickWand/wand-view.c
+++ b/MagickWand/wand-view.c
@@ -765,7 +765,7 @@
   wand_view->description=ConstantString("WandView");
   wand_view->wand=wand;
   exception=AcquireExceptionInfo();
-  wand_view->view=AcquireVirtualCacheView(wand_view->wand->images);
+  wand_view->view=AcquireVirtualCacheView(wand_view->wand->images,exception);
   wand_view->extent.width=wand->images->columns;
   wand_view->extent.height=wand->images->rows;
   wand_view->pixel_wands=AcquirePixelsThreadSet(wand_view->extent.width);
@@ -826,7 +826,7 @@
     WandViewId,(double) wand_view->id);
   wand_view->description=ConstantString("WandView");
   exception=AcquireExceptionInfo();
-  wand_view->view=AcquireVirtualCacheView(wand_view->wand->images);
+  wand_view->view=AcquireVirtualCacheView(wand_view->wand->images,exception);
   wand_view->wand=wand;
   wand_view->extent.width=width;
   wand_view->extent.height=height;