commit db070957cf6bf959df9283a482377e8854c3d4d2
author cristy <urban-warrior@git.imagemagick.org> Fri Apr 20 14:33:00 2012 +0000
committer cristy <urban-warrior@git.imagemagick.org> Fri Apr 20 14:33:00 2012 +0000
tree 63b86ddb60e1253f3e722a800a309b7972158a8f
parent b1e21ed484f85de934d438df678d9d8ca3b4c7b5

coders/msl.c

diff --git a/coders/msl.c b/coders/msl.c
index 0ba8318..f0feae7 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -1954,7 +1954,8 @@
                       if (composite_image->matte != MagickTrue)
                         (void) SetImageAlpha(composite_image,OpaqueAlpha,
                           &exception);
-                      composite_view=AcquireCacheView(composite_image);
+                      composite_view=AcquireAuthenticCacheView(composite_image,
+                        &exception);
                       for (y=0; y < (ssize_t) composite_image->rows ; y++)
                       {
                         q=GetCacheViewAuthenticPixels(composite_view,0,y,

coders/xtrn.c

diff --git a/coders/xtrn.c b/coders/xtrn.c
index 64c5ca0..4fbb2b2 100644
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -148,7 +148,7 @@
       (void) sscanf(clone_info->filename,"%lx,%lx",&param1,&param2);
       image_ptr=(Image **) param2;
       if (*image_ptr != (Image *)NULL)
-        image=CloneImage(*image_ptr,0,0,MagickFalse,exception);
+        image=CloneImage(*image_ptr,0,0,MagickFalse,&(*image_ptr)->exception);
 #ifdef ALL_IMAGEINFO
       image_info_ptr=(ImageInfo **) param1;
       if (*image_info_ptr != (ImageInfo *)NULL)
@@ -595,7 +595,7 @@
           SetImageInfo(clone_info,1,exception);
           (void) CopyMagickString(image->magick,clone_info->magick,
             MaxTextExtent);
-          status=WriteStream(clone_info,image,fifo,exception);
+          status=WriteStream(clone_info,image,fifo);
           if (status == MagickFalse)
             CatchImageException(image);
         }
@@ -624,7 +624,7 @@
           SetImageInfo(clone_info,1,exception);
           (void) CopyMagickString(image->magick,clone_info->magick,
             MaxTextExtent);
-          status=WriteStream(clone_info,image,SafeArrayFifo,exception);
+          status=WriteStream(clone_info,image,SafeArrayFifo);
           if (status == MagickFalse)
             CatchImageException(image);
         }