GraphicsMagick: WPG: ApproveFormatForWPG(), Pass in existing Exc...

changeset 8c82d3be7869 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=8c82d3be7869
summary: WPG: ApproveFormatForWPG(), Pass in existing ExceptionInfo pointer

diffstat:

 ChangeLog                              |   9 +++++++--
 VisualMagick/installer/inc/version.isx |   4 ++--
 coders/wpg.c                           |   7 +++----
 magick/version.h                       |   4 ++--
 www/Changelog.html                     |  14 ++++++++++++++
 5 files changed, 28 insertions(+), 10 deletions(-)

diffs (97 lines):

diff -r 3da5e3fca8f8 -r 8c82d3be7869 ChangeLog
--- a/ChangeLog	Tue Jan 31 22:49:32 2023 +0100
+++ b/ChangeLog	Sat Feb 04 08:19:21 2023 -0600
@@ -1,7 +1,12 @@
+2023-02-04  Bob Friesenhahn  <[email protected]>
+
+	* coders/wpg.c (ApproveFormatForWPG): Pass in existing
+	ExceptionInfo pointer.
+
 2023-01-31  Fojtik Jaroslav  <[email protected]>
 
-	* coders/wpg.c: Do not approve any format from "META" module 
-        for embedding.
+	* coders/wpg.c: Do not approve any format from "META" module
+	for embedding.
 
 2023-01-28  Bob Friesenhahn  <[email protected]>
 
diff -r 3da5e3fca8f8 -r 8c82d3be7869 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Tue Jan 31 22:49:32 2023 +0100
+++ b/VisualMagick/installer/inc/version.isx	Sat Feb 04 08:19:21 2023 -0600
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020230128"
-#define public MagickPackageReleaseDate "snapshot-20230128"
+#define public MagickPackageVersionAddendum ".020230204"
+#define public MagickPackageReleaseDate "snapshot-20230204"
diff -r 3da5e3fca8f8 -r 8c82d3be7869 coders/wpg.c
--- a/coders/wpg.c	Tue Jan 31 22:49:32 2023 +0100
+++ b/coders/wpg.c	Sat Feb 04 08:19:21 2023 -0600
@@ -190,15 +190,14 @@
 };
 
 
-static int ApproveFormatForWPG(const char *Format)
+static int ApproveFormatForWPG(const char *Format, ExceptionInfo *exception)
 {
-  ExceptionInfo exception;
   const MagickInfo *magick_info;
 
   if(!strcmp(Format,"PFB")) return 0;
 
   /*if(!strcmp(Format,"8BIMTEXT")) return 0; This test is no longer needed, META module includes this case. */
-  magick_info = GetMagickInfo(Format,&exception);
+  magick_info = GetMagickInfo(Format,exception);
   if(magick_info != (const MagickInfo *)NULL)
   {
     if(strcmp(magick_info->module, "META") == 0) return 0;
@@ -876,7 +875,7 @@
   /*
     Verify if this is an allowed subordinate image format
   */
-  if(!ApproveFormatForWPG(format))
+  if(!ApproveFormatForWPG(format,exception))
   {
     (void) LogMagickEvent(CoderEvent, GetMagickModule(),
                         "Format \"%s\" cannot be embedded inside WPG.", format);
diff -r 3da5e3fca8f8 -r 8c82d3be7869 magick/version.h
--- a/magick/version.h	Tue Jan 31 22:49:32 2023 +0100
+++ b/magick/version.h	Sat Feb 04 08:19:21 2023 -0600
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272402
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,2
-#define MagickChangeDate   "20230128"
-#define MagickReleaseDate  "snapshot-20230128"
+#define MagickChangeDate   "20230204"
+#define MagickReleaseDate  "snapshot-20230204"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 3da5e3fca8f8 -r 8c82d3be7869 www/Changelog.html
--- a/www/Changelog.html	Tue Jan 31 22:49:32 2023 +0100
+++ b/www/Changelog.html	Sat Feb 04 08:19:21 2023 -0600
@@ -37,6 +37,20 @@
 </div>
 
 <div class="document">
+<p>2023-02-04  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>coders/wpg.c (ApproveFormatForWPG): Pass in existing
+ExceptionInfo pointer.</p></li>
+</ul>
+</blockquote>
+<p>2023-01-31  Fojtik Jaroslav  &lt;<a class="reference external" href="mailto:JaFojtik&#37;&#52;&#48;yandex&#46;com">JaFojtik<span>&#64;</span>yandex<span>&#46;</span>com</a>&gt;</p>
+<blockquote>
+<ul class="simple">
+<li><p>coders/wpg.c: Do not approve any format from &quot;META&quot; module
+for embedding.</p></li>
+</ul>
+</blockquote>
 <p>2023-01-28  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">