GraphicsMagick: rwfile.c, rwblob.c DescribeFrames(): Add a 'ping...

GraphicsMagick Commits <[email protected]> Wed, 15 Nov 2023 08:36:34 -0600
Newsgroups gmane.comp.video.graphicsmagick.cvs
Message-ID <mailman.2800.1700059005.7794.graphicsmagick-commit@lists.sourceforge.net>
changeset 137b263329d5 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=137b263329d5
summary: rwfile.c, rwblob.c DescribeFrames(): Add a 'ping' option.

diffstat:

 ChangeLog                              |   6 ++++++
 VisualMagick/installer/inc/version.isx |   4 ++--
 magick/version.h                       |   4 ++--
 tests/rwblob.c                         |  11 ++++++-----
 tests/rwfile.c                         |  11 ++++++-----
 www/Changelog.html                     |   8 ++++++++
 6 files changed, 30 insertions(+), 14 deletions(-)

diffs (156 lines):

diff -r cda86fcb8814 -r 137b263329d5 ChangeLog
--- a/ChangeLog	Tue Nov 14 08:20:16 2023 -0600
+++ b/ChangeLog	Wed Nov 15 08:36:29 2023 -0600
@@ -1,3 +1,9 @@
+2023-11-15  Bob Friesenhahn  <[email protected]>
+
+	* tests/{rwfile.c, rwblob.c} (DescribeFrames): Add a 'ping' option
+	in case this function is activated on an image read with the
+	'ping' flag set.
+
 2023-11-14  Bob Friesenhahn  <[email protected]>
 
 	* configure.ac: Use CPPFLAGS delivered by pkg-config for
diff -r cda86fcb8814 -r 137b263329d5 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Tue Nov 14 08:20:16 2023 -0600
+++ b/VisualMagick/installer/inc/version.isx	Wed Nov 15 08:36:29 2023 -0600
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020231114"
-#define public MagickPackageReleaseDate "snapshot-20231114"
+#define public MagickPackageVersionAddendum ".020231115"
+#define public MagickPackageReleaseDate "snapshot-20231115"
diff -r cda86fcb8814 -r 137b263329d5 magick/version.h
--- a/magick/version.h	Tue Nov 14 08:20:16 2023 -0600
+++ b/magick/version.h	Wed Nov 15 08:36:29 2023 -0600
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272404
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,4
-#define MagickChangeDate   "20231114"
-#define MagickReleaseDate  "snapshot-20231114"
+#define MagickChangeDate   "20231115"
+#define MagickReleaseDate  "snapshot-20231115"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r cda86fcb8814 -r 137b263329d5 tests/rwblob.c
--- a/tests/rwblob.c	Tue Nov 14 08:20:16 2023 -0600
+++ b/tests/rwblob.c	Wed Nov 15 08:36:29 2023 -0600
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003 - 2018 GraphicsMagick Group
+ * Copyright (C) 2003 - 2023 GraphicsMagick Group
  * Copyright (C) 2003 ImageMagick Studio
  * Copyright 1991-1999 E. I. du Pont de Nemours and Company
  *
@@ -26,10 +26,11 @@
 #include <string.h>
 #include <locale.h>
 
-static void DescribeFrames(const ImageInfo *image_info, Image *list)
+static void DescribeFrames(const ImageInfo *image_info, Image *list, const MagickBool ping)
 {
   /* [0] AVS 70x46+072 Grayscale 8-bit adea7b1989cc5d19794a25ae3d7d0bc86f83b014f7231a869ee7b97177d54ab5 */
   static const char descr_fmt[] = "[%s] %m %wx%h%X%y %r %q-bit %#";
+  static const char descr_fmt_ping[] = "[%s] %m %wx%h%X%y %r %q-bit";
   Image *list_entry = list;
 
   while (list_entry != (Image *) NULL)
@@ -37,7 +38,7 @@
       char
         *text;
 
-      text=TranslateText(image_info,list_entry,descr_fmt);
+      text=TranslateText(image_info,list_entry,ping ? descr_fmt_ping : descr_fmt);
       if (text != (char *) NULL)
         {
           fprintf(stdout,"%s\n", text);
@@ -357,7 +358,7 @@
     else
       {
         /* Print a short description of the image to stdout */
-        /* DescribeFrames(imageInfo, ping_image); */
+        /* DescribeFrames(imageInfo, ping_image, MagickTrue); */
         /* (void) fflush(stdout); */
         DestroyImageList( ping_image );
       }
@@ -455,7 +456,7 @@
   blob=0;
 
   /* Print a short description of the image to stdout */
-  DescribeFrames(imageInfo, final);
+  DescribeFrames(imageInfo, final, MagickFalse);
   (void) fflush(stdout);
 
   if (check)
diff -r cda86fcb8814 -r 137b263329d5 tests/rwfile.c
--- a/tests/rwfile.c	Tue Nov 14 08:20:16 2023 -0600
+++ b/tests/rwfile.c	Wed Nov 15 08:36:29 2023 -0600
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003 - 2018 GraphicsMagick Group
+ * Copyright (C) 2003 - 2023 GraphicsMagick Group
  * Copyright (C) 2003 ImageMagick Studio
  * Copyright 1991-1999 E. I. du Pont de Nemours and Company
  *
@@ -26,10 +26,11 @@
 #include <string.h>
 #include <locale.h>
 
-static void DescribeFrames(const ImageInfo *image_info, Image *list)
+static void DescribeFrames(const ImageInfo *image_info, Image *list, const MagickBool ping)
 {
   /* [0] AVS 70x46+072 Grayscale 8-bit adea7b1989cc5d19794a25ae3d7d0bc86f83b014f7231a869ee7b97177d54ab5 */
   static const char descr_fmt[] = "[%s] %m %wx%h%X%y %r %q-bit %#";
+  static const char descr_fmt_ping[] = "[%s] %m %wx%h%X%y %r %q-bit";
   Image *list_entry = list;
 
   while (list_entry != (Image *) NULL)
@@ -37,7 +38,7 @@
       char
         *text;
 
-      text=TranslateText(image_info,list_entry,descr_fmt);
+      text=TranslateText(image_info,list_entry,ping ? descr_fmt_ping : descr_fmt);
       if (text != (char *) NULL)
         {
           fprintf(stdout,"%s\n", text);
@@ -421,7 +422,7 @@
     else
       {
         /* Print a short description of the image to stdout */
-        /* DescribeFrames(imageInfo, ping_image); */
+        /* DescribeFrames(imageInfo, ping_image, MagickTrue); */
         DestroyImageList( ping_image );
       }
     if (ping_error)
@@ -550,7 +551,7 @@
     }
 
   /* Print a short description of the image to stdout */
-  DescribeFrames(imageInfo, final);
+  DescribeFrames(imageInfo, final, MagickFalse);
   (void) fflush(stdout);
 
   if (check)
diff -r cda86fcb8814 -r 137b263329d5 www/Changelog.html
--- a/www/Changelog.html	Tue Nov 14 08:20:16 2023 -0600
+++ b/www/Changelog.html	Wed Nov 15 08:36:29 2023 -0600
@@ -37,6 +37,14 @@
 </div>
 
 <div class="document">
+<p>2023-11-15  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
+<blockquote>
+<ul class="simple">
+<li><p>tests/{rwfile.c, rwblob.c} (DescribeFrames): Add a 'ping' option
+in case this function is activated on an image read with the
+'ping' flag set.</p></li>
+</ul>
+</blockquote>
 <p>2023-11-14  Bob Friesenhahn  &lt;<a class="reference external" href="mailto:bfriesen&#37;&#52;&#48;simple&#46;dallas&#46;tx&#46;us">bfriesen<span>&#64;</span>simple<span>&#46;</span>dallas<span>&#46;</span>tx<span>&#46;</span>us</a>&gt;</p>
 <blockquote>
 <ul class="simple">