(no commit message)

diff --git a/config/english.xml b/config/english.xml
index adb85583f43d4f8c524caddaa12c17fff0163263..19d18a8759192d51abaa2e1b05e06bfe9bcf7089 100644 (file)
--- a/config/english.xml
+++ b/config/english.xml
@@ -1540,6 +1540,11 @@
         wave image
       </message>
     </Wave>
+    <Write>
+      <message name="Image">
+        write image
+      </message>
+    </Write>
     <XShear>
       <message name="Image">
         x shear image

diff --git a/config/francais.xml b/config/francais.xml
index 28ff5c5050b98dd6fe467af2d0d67deb94429bdb..85e7bfe412d4c6b5669e3efef60210cdd6f56a69 100644 (file)
--- a/config/francais.xml
+++ b/config/francais.xml
@@ -1522,6 +1522,11 @@
         Effet vagues pour l'image
       </message>
     </Wave>
+    <Write>
+      <message name="Image">
+        write image
+      </message>
+    </Write>
     <XShear>
       <message name="Image">
         X Shear image

diff --git a/magick/constitute.c b/magick/constitute.c
index 948bf5ebe7627dd86cda3067d2bea4c1b2411bc6..01445ac50446b6027cb8b0c747db8eba29d9b3fd 100644 (file)
--- a/magick/constitute.c
+++ b/magick/constitute.c
@@ -55,6 +55,7 @@
 #include "magick/magick.h"
 #include "magick/memory_.h"
 #include "magick/monitor.h"
+#include "magick/monitor-private.h"
 #include "magick/option.h"
 #include "magick/pixel.h"
 #include "magick/policy.h"
@@ -1221,6 +1222,8 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info,
 MagickExport MagickBooleanType WriteImages(const ImageInfo *image_info,
   Image *images,const char *filename,ExceptionInfo *exception)
 {
+#define WriteImageTag  "Write/Image"
+
   BlobInfo
     *blob;
 
@@ -1230,6 +1233,18 @@ MagickExport MagickBooleanType WriteImages(const ImageInfo *image_info,
   ImageInfo
     *write_info;
 
+  MagickBooleanType
+    proceed;
+
+  MagickOffsetType
+    i;
+
+  MagickProgressMonitor
+    progress_monitor;
+
+  MagickSizeType
+    number_images;
+
   MagickStatusType
     status;
 
@@ -1276,12 +1291,20 @@ MagickExport MagickBooleanType WriteImages(const ImageInfo *image_info,
     Write images.
   */
   status=MagickTrue;
+  i=0;
+  number_images=GetImageListLength(images);
   for (p=images; p != (Image *) NULL; p=GetNextImageInList(p))
   {
+    progress_monitor=SetImageProgressMonitor(p,(MagickProgressMonitor) NULL,
+      p->client_data);
     status&=WriteImage(write_info,p);
     GetImageException(p,exception);
+    (void) SetImageProgressMonitor(p,progress_monitor,p->client_data);
     if (write_info->adjoin != MagickFalse)
       break;
+    proceed=SetImageProgress(p,WriteImageTag,i++,number_images);
+    if (proceed == MagickFalse)
+      break;
   }
   write_info=DestroyImageInfo(write_info);
   return(status != 0 ? MagickTrue : MagickFalse);

diff --git a/magick/transform.c b/magick/transform.c
index 4f68e1ab63d0cc9183644e3d094578432b29b633..b353a9204e8a31a2b1c9dec29a324c3ee543d3ba 100644 (file)
--- a/magick/transform.c
+++ b/magick/transform.c
@@ -1828,6 +1828,8 @@ MagickExport MagickBooleanType TransformImage(Image **image,
                    break;
                  if (next == (Image *) NULL)
                    break;
+                 (void) SetImageProgressMonitor(next,progress_monitor,
+                   next->client_data);
                  AppendImageToList(&crop_image,next);
                }
                if (next == (Image *) NULL)