[prev in list] [next in list] [prev in thread] [next in thread] 

List:       graphicsmagick-commit
Subject:    [GM-commit] GraphicsMagick: DescribeImage(): Only show read rates when not i...
From:       GraphicsMagick Commits <graphicsmagick-commit () lists ! sourceforge ! net>
Date:       2016-08-08 13:39:34
Message-ID: hg.fe96878b901b.1470663574.2950750188400161634 () src ! simplesystems ! org
[Download RAW message or body]

changeset fe96878b901b in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=fe96878b901b
                
summary: DescribeImage(): Only show read rates when not in ping mode.  Provide 6 \
digits of seconds precision.

diffstat:

 ChangeLog         |  7 +++++++
 magick/describe.c |  8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r 552dfa1f1bdb -r fe96878b901b ChangeLog
--- a/ChangeLog	Sun Aug 07 16:39:39 2016 -0500
+++ b/ChangeLog	Mon Aug 08 08:39:31 2016 -0500
@@ -1,3 +1,10 @@
+2016-08-08  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
+
+	* magick/describe.c (DescribeImage): The 'identify' and 'info'
+	functionality only shows the pixel read rate if image was not read
+	in 'ping' mode.  Provide seconds timing with 6 digits of precision
+	since that is what is needed.
+
 2016-08-07  Bob Friesenhahn  <bfriesen@simple.dallas.tx.us>
 
 	* magick/describe.c (DescribeImage): Include milliseconds
diff -r 552dfa1f1bdb -r fe96878b901b magick/describe.c
--- a/magick/describe.c	Sun Aug 07 16:39:39 2016 -0500
+++ b/magick/describe.c	Mon Aug 08 08:39:31 2016 -0500
@@ -165,7 +165,7 @@
           FormatSize(GetBlobSize(image),format);
           (void) fprintf(file,"%.1024s ",format);
         }
-      (void) fprintf(file,"%0.3fu %ldm:%.3fs",
+      (void) fprintf(file,"%0.3fu %ldm:%.6fs",
                      user_time,
                      (long) (elapsed_time/60.0),
                      fmod(elapsed_time,60.0));
@@ -174,7 +174,7 @@
         least six times the timer's resolution (typically 0.01 on
         Unix).
       */
-      if (elapsed_time >= GetTimerResolution()*6)
+      if (!(image->ping) && (elapsed_time >= GetTimerResolution()*6))
         {
           pixels_per_second=(magick_int64_t) ((double) rows*columns/
                                               elapsed_time);
@@ -890,9 +890,9 @@
   */
   if (user_time >= GetTimerResolution())
     (void) fprintf(file,"  User Time: %0.3fu\n",user_time);
-  if (elapsed_time >= GetTimerResolution())
+  if (!(image->ping) && (elapsed_time >= GetTimerResolution()))
     {
-      (void) fprintf(file,"  Elapsed Time: %ldm:%.3fs\n",
+      (void) fprintf(file,"  Elapsed Time: %ldm:%.6fs\n",
                      (long) (elapsed_time/60.0),
                      fmod(elapsed_time,60.0));
       pixels_per_second=(magick_int64_t) ((double) image->rows*

------------------------------------------------------------------------------
_______________________________________________
Graphicsmagick-commit mailing list
Graphicsmagick-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/graphicsmagick-commit


[prev in list] [next in list] [prev in thread] [next in thread]