(no commit message)

diff --git a/magick/identify.c b/magick/identify.c
index 9f40f4161487d29ca8454e52fdef99dff0872465..29514e51409b6a01252b69123b4ffbb5e8309712 100644 (file)
--- a/magick/identify.c
+++ b/magick/identify.c
@@ -242,10 +242,9 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
           (void) FormatMagickSize(GetBlobSize(image),format);
           (void) fprintf(file,"%s ",format);
         }
-      if (elapsed_time > 0.06)
-        (void) fprintf(file,"%0.3fu %ld:%02ld.%03ld",user_time,(long)
-          (elapsed_time/60.0+0.5),(long) floor(fmod(elapsed_time,60.0)),
-          (long) (1000.0*(elapsed_time-floor(elapsed_time))+0.5));
+      (void) fprintf(file,"%0.3fu %ld:%02ld.%03ld",user_time,(long)
+        (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
       (void) fprintf(file,"\n");
       (void) fflush(file);
       return(ferror(file) != 0 ? MagickFalse : MagickTrue);
@@ -987,18 +986,15 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   (void) fprintf(file,"  Filesize: %s\n",format);
   (void) FormatMagickSize((MagickSizeType) image->columns*image->rows,format);
   (void) fprintf(file,"  Number pixels: %s\n",format);
-  if (elapsed_time > 0.06)
-    {
-      (void) FormatMagickSize((MagickSizeType) ((double) image->columns*
-        image->rows/elapsed_time+0.5),format);
-      (void) fprintf(file,"  Pixels per second: %s\n",format);
-      (void) fprintf(file,"  User time: %0.3fu\n",user_time);
-      (void) fprintf(file,"  Elapsed time: %ld:%02ld.%03ld\n",(long) (
-        elapsed_time/60.0+0.5),(long) ceil(fmod(elapsed_time,60.0)),
-        (long) (1000.0*(elapsed_time-floor(elapsed_time))+0.5));
-    }
-  (void) fprintf(file,"  Version: %s\n",GetMagickVersion(
-    (unsigned long *) NULL));
+  (void) FormatMagickSize((MagickSizeType) ((double) image->columns*image->rows/
+    elapsed_time+0.5),format);
+  (void) fprintf(file,"  Pixels per second: %s\n",format);
+  (void) fprintf(file,"  User time: %0.3fu\n",user_time);
+  (void) fprintf(file,"  Elapsed time: %ld:%02ld.%03ld\n",(long)
+    (elapsed_time/60.0),(long) ceil(fmod(elapsed_time,60.0)),(long)
+    (1000.0*(elapsed_time-floor(elapsed_time))));
+  (void) fprintf(file,"  Version: %s\n",GetMagickVersion((unsigned long *)
+    NULL));
   (void) fflush(file);
   return(ferror(file) != 0 ? MagickFalse : MagickTrue);
 }

diff --git a/tests/validate.c b/tests/validate.c
index 6e15b9475f57e9fc42fc861224e0873383bddbdc..7e31bdfeb871870134993af5e4f035bd7cd74963 100644 (file)
--- a/tests/validate.c
+++ b/tests/validate.c
@@ -1426,9 +1426,10 @@ int main(int argc,char **argv)
     {
       elapsed_time=GetElapsedTime(timer);
       user_time=GetUserTime(timer);
-      (void) fprintf(stderr,"Performance: %lui %gips %0.3fu %ld:%02ld\n",
+      (void) fprintf(stderr,"Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",
         iterations,1.0*iterations/elapsed_time,user_time,(long)
-        (elapsed_time/60.0+0.5),(long) ceil(fmod(elapsed_time,60.0)));
+        (elapsed_time/60.0),(long) ceil(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
       timer=DestroyTimerInfo(timer);
     }
   DestroyValidate();

diff --git a/utilities/animate.c b/utilities/animate.c
index c662add4562b2846c1f5267b55ceb6807b1572b8..93bbaa635b8d31a29ddbb30bce7d81818995de01 100644 (file)
--- a/utilities/animate.c
+++ b/utilities/animate.c
@@ -159,8 +159,8 @@ int main(int argc,char **argv)
       user_time=GetUserTime(timer);
       (void) fprintf(stderr,"Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",
         iterations,1.0*iterations/elapsed_time,user_time,(long)
-        (elapsed_time/60.0+0.5),(long) floor(fmod(elapsed_time,60.0)),
-        (long) (1000.0*(elapsed_time-floor(elapsed_time))+0.5));
+        (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
       timer=DestroyTimerInfo(timer);
     }
   exception=DestroyExceptionInfo(exception);

diff --git a/utilities/compare.c b/utilities/compare.c
index abd4a8b2798788fb3dfafe1fa4dd59b43ddfdc42..0d17300b303b4ea320e626bc40688f85db5b3e9b 100644 (file)
--- a/utilities/compare.c
+++ b/utilities/compare.c
@@ -140,8 +140,8 @@ int main(int argc,char **argv)
       user_time=GetUserTime(timer);
       (void) fprintf(stderr,"Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",
         iterations,1.0*iterations/elapsed_time,user_time,(long)
-        (elapsed_time/60.0+0.5),(long) floor(fmod(elapsed_time,60.0)),
-        (long) (1000.0*(elapsed_time-floor(elapsed_time))+0.5));
+        (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
       timer=DestroyTimerInfo(timer);
     }
   exception=DestroyExceptionInfo(exception);

diff --git a/utilities/composite.c b/utilities/composite.c
index f8288608435a64e62c6570b42639d4ff073e7193..2835336b69713ad3bbbff8ecda3f4cf31a0fb730 100644 (file)
--- a/utilities/composite.c
+++ b/utilities/composite.c
@@ -131,8 +131,8 @@ int main(int argc,char **argv)
       user_time=GetUserTime(timer);
       (void) fprintf(stderr,"Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",
         iterations,1.0*iterations/elapsed_time,user_time,(long)
-        (elapsed_time/60.0+0.5),(long) floor(fmod(elapsed_time,60.0)),
-        (long) (1000.0*(elapsed_time-floor(elapsed_time))+0.5));
+        (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
       timer=DestroyTimerInfo(timer);
     }
   exception=DestroyExceptionInfo(exception);

diff --git a/utilities/conjure.c b/utilities/conjure.c
index 3f81a588cb9dc23b8c804c645071065a13e8c85d..8d7969040496b6c2452dacbd94b8d32e5512101a 100644 (file)
--- a/utilities/conjure.c
+++ b/utilities/conjure.c
@@ -150,8 +150,8 @@ int main(int argc,char **argv)
       user_time=GetUserTime(timer);
       (void) fprintf(stderr,"Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",
         iterations,1.0*iterations/elapsed_time,user_time,(long)
-        (elapsed_time/60.0+0.5),(long) floor(fmod(elapsed_time,60.0)),
-        (long) (1000.0*(elapsed_time-floor(elapsed_time))+0.5));
+        (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
       timer=DestroyTimerInfo(timer);
     }
   exception=DestroyExceptionInfo(exception);

diff --git a/utilities/convert.c b/utilities/convert.c
index e4062e6e0e9b3d4daf285cd8ea5fe2d9bcae0d43..ef6bd8332154f9dd2adae4d4e2753e694abad863 100644 (file)
--- a/utilities/convert.c
+++ b/utilities/convert.c
@@ -137,8 +137,8 @@ int main(int argc,char **argv)
       user_time=GetUserTime(timer);
       (void) fprintf(stderr,"Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",
         iterations,1.0*iterations/elapsed_time,user_time,(long)
-        (elapsed_time/60.0+0.5),(long) floor(fmod(elapsed_time,60.0)),
-        (long) (1000.0*(elapsed_time-floor(elapsed_time))+0.5));
+        (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
       timer=DestroyTimerInfo(timer);
     }
   exception=DestroyExceptionInfo(exception);

diff --git a/utilities/display.c b/utilities/display.c
index c7f71ee49e11b297cb8d6439ee7583fe001544cf..51aa8a011fac4c308d0e26d30f92efbae9b157b8 100644 (file)
--- a/utilities/display.c
+++ b/utilities/display.c
@@ -161,8 +161,8 @@ int main(int argc,char **argv)
       user_time=GetUserTime(timer);
       (void) fprintf(stderr,"Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",
         iterations,1.0*iterations/elapsed_time,user_time,(long)
-        (elapsed_time/60.0+0.5),(long) floor(fmod(elapsed_time,60.0)),
-        (long) (1000.0*(elapsed_time-floor(elapsed_time))+0.5));
+        (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
       timer=DestroyTimerInfo(timer);
     }
   exception=DestroyExceptionInfo(exception);

diff --git a/utilities/identify.c b/utilities/identify.c
index e004e9671f422a2cb874b329d0494364a2f710fb..cd5a33bac1e0868750a99c290c27e92e604b5849 100644 (file)
--- a/utilities/identify.c
+++ b/utilities/identify.c
@@ -140,8 +140,8 @@ int main(int argc,char **argv)
       user_time=GetUserTime(timer);
       (void) fprintf(stderr,"Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",
         iterations,1.0*iterations/elapsed_time,user_time,(long)
-        (elapsed_time/60.0+0.5),(long) floor(fmod(elapsed_time,60.0)),
-        (long) (1000.0*(elapsed_time-floor(elapsed_time))+0.5));
+        (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
       timer=DestroyTimerInfo(timer);
     }
   exception=DestroyExceptionInfo(exception);

diff --git a/utilities/import.c b/utilities/import.c
index 529ce619f943de29222c0e18596f2b4ff6da1e67..4b5ea2da35c45f25e8daf1979765e5d22c7e9f52 100644 (file)
--- a/utilities/import.c
+++ b/utilities/import.c
@@ -137,8 +137,8 @@ int main(int argc,char **argv)
       user_time=GetUserTime(timer);
       (void) fprintf(stderr,"Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",
         iterations,1.0*iterations/elapsed_time,user_time,(long)
-        (elapsed_time/60.0+0.5),(long) floor(fmod(elapsed_time,60.0)),
-        (long) (1000.0*(elapsed_time-floor(elapsed_time))+0.5));
+        (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
       timer=DestroyTimerInfo(timer);
     }
   exception=DestroyExceptionInfo(exception);

diff --git a/utilities/mogrify.c b/utilities/mogrify.c
index 5c95eaabf08073a6e4b694b11b00c3d49edbacb6..0c8abf44db21d8dc2115b6e0f78c6aad5d98e813 100644 (file)
--- a/utilities/mogrify.c
+++ b/utilities/mogrify.c
@@ -133,8 +133,8 @@ int main(int argc,char **argv)
       user_time=GetUserTime(timer);
       (void) fprintf(stderr,"Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",
         iterations,1.0*iterations/elapsed_time,user_time,(long)
-        (elapsed_time/60.0+0.5),(long) floor(fmod(elapsed_time,60.0)),
-        (long) (1000.0*(elapsed_time-floor(elapsed_time))+0.5));
+        (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
       timer=DestroyTimerInfo(timer);
     }
   exception=DestroyExceptionInfo(exception);

diff --git a/utilities/montage.c b/utilities/montage.c
index f668371b6ed3985b01b9daf751bfd80925c36049..d8e0a979d13ef1511a73ad0802935d843b7cef33 100644 (file)
--- a/utilities/montage.c
+++ b/utilities/montage.c
@@ -133,8 +133,8 @@ int main(int argc,char **argv)
       user_time=GetUserTime(timer);
       (void) fprintf(stderr,"Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",
         iterations,1.0*iterations/elapsed_time,user_time,(long)
-        (elapsed_time/60.0+0.5),(long) floor(fmod(elapsed_time,60.0)),
-        (long) (1000.0*(elapsed_time-floor(elapsed_time))+0.5));
+        (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
       timer=DestroyTimerInfo(timer);
     }
   exception=DestroyExceptionInfo(exception);

diff --git a/utilities/stream.c b/utilities/stream.c
index 07f06d6cbde760cdb4f9544a288949b5ab164605..4c5c9f114f4fc42b2c4edc02ea64380d4cb7b997 100644 (file)
--- a/utilities/stream.c
+++ b/utilities/stream.c
@@ -133,8 +133,8 @@ int main(int argc,char **argv)
       user_time=GetUserTime(timer);
       (void) fprintf(stderr,"Performance: %lui %gips %0.3fu %ld:%02ld.%03ld\n",
         iterations,1.0*iterations/elapsed_time,user_time,(long)
-        (elapsed_time/60.0+0.5),(long) floor(fmod(elapsed_time,60.0)),
-        (long) (1000.0*(elapsed_time-floor(elapsed_time))+0.5));
+        (elapsed_time/60.0),(long) floor(fmod(elapsed_time,60.0)),
+        (long) (1000.0*(elapsed_time-floor(elapsed_time))));
       timer=DestroyTimerInfo(timer);
     }
   exception=DestroyExceptionInfo(exception);