(no commit message)

diff --git a/magick/transform.c b/magick/transform.c
index b353a9204e8a31a2b1c9dec29a324c3ee543d3ba..3b0ae53448733b92203eaac18116c8521f287c73 100644 (file)
--- a/magick/transform.c
+++ b/magick/transform.c
@@ -1807,8 +1807,10 @@ MagickExport MagickBooleanType TransformImage(Image **image,
              next=NewImageList();
              proceed=MagickTrue;
              i=0;
-             number_images=(MagickSizeType) transform_image->page.height*
-               transform_image->page.width/height/width;
+             number_images=0;
+             for (y=0; y < (long) transform_image->page.height; y+=height)
+               for (x=0; x < (long) transform_image->page.width; x+=width)
+                 number_images++;
              for (y=0; y < (long) transform_image->page.height; y+=height)
              {
                for (x=0; x < (long) transform_image->page.width; x+=width)

diff --git a/wand/mogrify.c b/wand/mogrify.c
index 4c1eaa82b79fc05eddfa2d53e0295a0e3d0a40b0..b84feae9bd0ccae31de58041bbc8e2d35a6aeea5 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -47,6 +47,7 @@
 #include "wand/studio.h"
 #include "wand/MagickWand.h"
 #include "wand/mogrify-private.h"
+#include "magick/monitor-private.h"
 #include "magick/thread-private.h"
 #include "magick/string-private.h"
 \f
@@ -8342,15 +8343,18 @@ WandExport MagickBooleanType MogrifyImages(ImageInfo *image_info,
     *image,
     *mogrify_images;
 
+  MagickBooleanType
+    proceed;
+
+  MagickSizeType
+    number_images;
+
   MagickStatusType
     status;
 
   register long
     i;
 
-  unsigned long
-    number_images;
-
   /*
     Apply options to individual images in the list.
   */
@@ -8378,14 +8382,10 @@ WandExport MagickBooleanType MogrifyImages(ImageInfo *image_info,
       continue;
     status&=MogrifyImage(image_info,argc,argv,&image,exception);
     AppendImageToList(&mogrify_images,image);
-    if ((image->progress_monitor != (MagickProgressMonitor) NULL) &&
-        (QuantumTick(i,number_images) != MagickFalse))
-      {
-        status=image->progress_monitor(MogrifyImageTag,i,number_images,
-          image->client_data);
-        if (status == MagickFalse)
-          break;
-      }
+    proceed=SetImageProgress(image,MogrifyImageTag,(MagickOffsetType) i,
+      number_images);
+    if (proceed == MagickFalse)
+      break;
   }
   if (post != MagickFalse)
     status&=MogrifyImageList(image_info,argc,argv,&mogrify_images,exception);