]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Fri, 14 Dec 2012 18:30:30 +0000 (18:30 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Fri, 14 Dec 2012 18:30:30 +0000 (18:30 +0000)
MagickCore/display.c
MagickCore/xwindow.c
coders/msl.c

index be5e32059e785ce28df97875833082752b87a58e..bc26228bfc70951dc3cfae65913c0fbf07b9632a 100644 (file)
@@ -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:
index 8b0ba5210c5687d48e33b3615ff7766047c8b315..507edad694b7e29190ba0b0a0722faff0eac4f18 100644 (file)
@@ -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
index 289f287c3000cbeca72629f708a19b40f8ce44d7..403ee2c6bb3a50b7451b72a485d6705482e96355 100644 (file)
@@ -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,