From 3d23169aa81971c55ca0036a29f773182142e6bb Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 29 Sep 2009 01:05:22 +0000 Subject: [PATCH] --- magick/identify.c | 28 ++++++++++++---------------- tests/validate.c | 5 +++-- utilities/animate.c | 4 ++-- utilities/compare.c | 4 ++-- utilities/composite.c | 4 ++-- utilities/conjure.c | 4 ++-- utilities/convert.c | 4 ++-- utilities/display.c | 4 ++-- utilities/identify.c | 4 ++-- utilities/import.c | 4 ++-- utilities/mogrify.c | 4 ++-- utilities/montage.c | 4 ++-- utilities/stream.c | 4 ++-- 13 files changed, 37 insertions(+), 40 deletions(-) diff --git a/magick/identify.c b/magick/identify.c index 9f40f4161..29514e514 100644 --- 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 6e15b9475..7e31bdfeb 100644 --- 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 c662add45..93bbaa635 100644 --- 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 abd4a8b27..0d17300b3 100644 --- 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 f82886084..2835336b6 100644 --- 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 3f81a588c..8d7969040 100644 --- 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 e4062e6e0..ef6bd8332 100644 --- 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 c7f71ee49..51aa8a011 100644 --- 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 e004e9671..cd5a33bac 100644 --- 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 529ce619f..4b5ea2da3 100644 --- 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 5c95eaabf..0c8abf44d 100644 --- 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 f668371b6..d8e0a979d 100644 --- 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 07f06d6cb..4c5c9f114 100644 --- 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); -- 2.50.1