(no commit message)

diff --git a/MagickCore/image-view.c b/MagickCore/image-view.c
index d0c050f99f0bad8950a6f974a91080e1bfd2f5cd..edfa608f3477254a205f8bc3c00844fefa0360e2 100644 (file)
--- a/MagickCore/image-view.c
+++ b/MagickCore/image-view.c
@@ -237,11 +237,11 @@ MagickExport MagickBooleanType DuplexTransferImageViewIterator(
     return(MagickFalse);
   source_image=source->image;
   destination_image=destination->image;
+  exception=destination->exception;
   if (SetImageStorageClass(destination_image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   status=MagickTrue;
   progress=0;
-  exception=destination->exception;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,1) shared(progress,status) num_threads(source->number_threads)
 #endif
@@ -884,11 +884,11 @@ MagickExport MagickBooleanType SetImageViewIterator(ImageView *destination,
   if (set == (SetImageViewMethod) NULL)
     return(MagickFalse);
   destination_image=destination->image;
+  exception=destination->exception;
   if (SetImageStorageClass(destination_image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   status=MagickTrue;
   progress=0;
-  exception=destination->exception;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,1) shared(progress,status) num_threads(destination->number_threads)
 #endif
@@ -1048,11 +1048,11 @@ MagickExport MagickBooleanType TransferImageViewIterator(ImageView *source,
     return(MagickFalse);
   source_image=source->image;
   destination_image=destination->image;
+  exception=destination->exception;
   if (SetImageStorageClass(destination_image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   status=MagickTrue;
   progress=0;
-  exception=destination->exception;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,1) shared(progress,status) num_threads(source->number_threads)
 #endif
@@ -1178,11 +1178,11 @@ MagickExport MagickBooleanType UpdateImageViewIterator(ImageView *source,
   if (update == (UpdateImageViewMethod) NULL)
     return(MagickFalse);
   source_image=source->image;
+  exception=source->exception;
   if (SetImageStorageClass(source_image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   status=MagickTrue;
   progress=0;
-  exception=source->exception;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,1) shared(progress,status) num_threads(source->number_threads)
 #endif

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 2d8bc1f877e48e7a80c5385351ed92f89f7ae8b3..d2bec910f7b6ffeed850bd462c20ab9360498548 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -2318,6 +2318,7 @@ MagickExport MagickBooleanType SeparateImage(Image *image)
   assert(image->signature == MagickSignature);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+  exception=(&image->exception);
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   /*
@@ -2325,7 +2326,6 @@ MagickExport MagickBooleanType SeparateImage(Image *image)
   */
   status=MagickTrue;
   progress=0;
-  exception=(&image->exception);
   image_view=AcquireCacheView(image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(dynamic,4) shared(progress,status)
@@ -2552,6 +2552,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
       */
       if (image->matte == MagickFalse)
         break;
+      exception=(&image->exception);
       if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
         break;
       GetPixelInfo(image,&background);
@@ -2560,7 +2561,6 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
         ConvertRGBToCMYK(&background);
       SetPacketPixelInfo(image,&background,&pixel);
       status=MagickTrue;
-      exception=(&image->exception);
       image_view=AcquireCacheView(image);
       #if defined(MAGICKCORE_OPENMP_SUPPORT)
         #pragma omp parallel for schedule(dynamic,4) shared(status)