From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 14 Dec 2012 18:30:30 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4590
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f5395df39e037392db46729f9aab05f2a9a428f;p=imagemagick

---

diff --git a/MagickCore/display.c b/MagickCore/display.c
index be5e32059..bc26228bf 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -3734,7 +3734,7 @@ static MagickBooleanType XColorEditImage(Display *display,
         if ((x_offset >= (int) (*image)->columns) ||
             (y_offset >= (int) (*image)->rows))
           continue;
-        image_view=AcquireAuthenticCacheView(*image);
+        image_view=AcquireAuthenticCacheView(*image,exception);
         switch (method)
         {
           case PointMethod:
@@ -10095,7 +10095,7 @@ static MagickBooleanType XMatteEditImage(Display *display,
           return(MagickFalse);
         if ((*image)->alpha_trait != BlendPixelTrait)
           (void) SetImageAlphaChannel(*image,OpaqueAlphaChannel,exception);
-        image_view=AcquireAuthenticCacheView(*image);
+        image_view=AcquireAuthenticCacheView(*image,exception);
         switch (method)
         {
           case PointMethod:
diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index 8b0ba5210..507edad69 100644
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -561,7 +561,7 @@ MagickPrivate MagickBooleanType XAnnotateImage(Display *display,
     (ssize_t) y,&annotate_image->background_color,exception);
   if (annotate_info->stencil == ForegroundStencil)
     annotate_image->alpha_trait=BlendPixelTrait;
-  annotate_view=AcquireAuthenticCacheView(annotate_image);
+  annotate_view=AcquireAuthenticCacheView(annotate_image,exception);
   for (y=0; y < (int) annotate_image->rows; y++)
   {
     register int
@@ -2484,7 +2484,7 @@ MagickPrivate MagickBooleanType XDrawImage(Display *display,
   if (SetImageStorageClass(draw_image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   draw_image->alpha_trait=BlendPixelTrait;
-  draw_view=AcquireAuthenticCacheView(draw_image);
+  draw_view=AcquireAuthenticCacheView(draw_image,exception);
   for (y=0; y < (int) draw_image->rows; y++)
   {
     register int
@@ -2610,7 +2610,7 @@ MagickPrivate MagickBooleanType XDrawImage(Display *display,
   /*
     Composite text onto the image.
   */
-  draw_view=AcquireAuthenticCacheView(draw_image);
+  draw_view=AcquireAuthenticCacheView(draw_image,exception);
   for (y=0; y < (int) draw_image->rows; y++)
   {
     register int
diff --git a/coders/msl.c b/coders/msl.c
index 289f287c3..403ee2c6b 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -1955,7 +1955,7 @@ static void MSLStartElement(void *context,const xmlChar *tag,
                       if (composite_image->alpha_trait == UndefinedPixelTrait)
                         (void) SetImageAlpha(composite_image,OpaqueAlpha,
                           &exception);
-                      composite_view=AcquireAuthenticCacheView(composite_image,exception);
+                      composite_view=AcquireAuthenticCacheView(composite_image,&exception);
                       for (y=0; y < (ssize_t) composite_image->rows ; y++)
                       {
                         q=GetCacheViewAuthenticPixels(composite_view,0,y,