GraphicsMagick: 2 new changesets

changeset b27357d95998 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=b27357d95998
summary: coders/wpg.c: Format "8BIMTEXT" cannot be embedded inside WPG, also check GetPixelCachePresent.

changeset 5b3c6a9b0249 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=5b3c6a9b0249
summary: merge

diffstat:

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

diffs (91 lines):

diff -r ae0e94f01f3e -r 5b3c6a9b0249 ChangeLog
--- a/ChangeLog	Tue Jan 24 23:55:52 2023 +0100
+++ b/ChangeLog	Wed Jan 25 00:40:47 2023 +0100
@@ -1,3 +1,7 @@
+2023-01-25  Fojtik Jaroslav  <[email protected]>
+
+	* coders/wpg.c: Format "8BIMTEXT" cannot be embedded inside WPG.
+
 2023-01-24  Fojtik Jaroslav  <[email protected]>
 
 	* VisualMagick/tests/runtest.bat Add missing tests of fileformats.
diff -r ae0e94f01f3e -r 5b3c6a9b0249 VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Tue Jan 24 23:55:52 2023 +0100
+++ b/VisualMagick/installer/inc/version.isx	Wed Jan 25 00:40:47 2023 +0100
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020230115"
-#define public MagickPackageReleaseDate "snapshot-20230115"
+#define public MagickPackageVersionAddendum ".020230124"
+#define public MagickPackageReleaseDate "snapshot-20230124"
diff -r ae0e94f01f3e -r 5b3c6a9b0249 coders/wpg.c
--- a/coders/wpg.c	Tue Jan 24 23:55:52 2023 +0100
+++ b/coders/wpg.c	Wed Jan 25 00:40:47 2023 +0100
@@ -193,6 +193,7 @@
 static int ApproveFormatForWPG(const char *Format)
 {
   if(!strcmp(Format,"PFB")) return 0;
+  if(!strcmp(Format,"8BIMTEXT")) return 0;
   return 1;
 }
 
@@ -963,8 +964,18 @@
     {
       goto FINISH_UNL;
     }
-  if(exception->severity>=ErrorException) /* When exception is raised, destroy image2 read. */
+  if(exception->severity >= ErrorException) /* When exception is raised, destroy image2 read. */
   {
+    if(image->logging)
+      (void) LogMagickEvent(CoderEvent,GetMagickModule(), "Exception raised during embedded image reading.");
+    CloseBlob(image2);
+    DestroyImageList(image2);
+    goto FINISH_UNL;
+  }
+  if(!GetPixelCachePresent(image2))
+  {
+    if(image->logging)
+      (void) LogMagickEvent(CoderEvent,GetMagickModule(), "Pixel cache is missing for embedded image.");
     CloseBlob(image2);
     DestroyImageList(image2);
     goto FINISH_UNL;
@@ -1790,6 +1801,7 @@
 }
 
 
+/* RLE helper structure. */
 typedef struct
 {
 	unsigned char count;
diff -r ae0e94f01f3e -r 5b3c6a9b0249 magick/version.h
--- a/magick/version.h	Tue Jan 24 23:55:52 2023 +0100
+++ b/magick/version.h	Wed Jan 25 00:40:47 2023 +0100
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272402
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,2
-#define MagickChangeDate   "20230115"
-#define MagickReleaseDate  "snapshot-20230115"
+#define MagickChangeDate   "20230124"
+#define MagickReleaseDate  "snapshot-20230124"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r ae0e94f01f3e -r 5b3c6a9b0249 www/Changelog.html
--- a/www/Changelog.html	Tue Jan 24 23:55:52 2023 +0100
+++ b/www/Changelog.html	Wed Jan 25 00:40:47 2023 +0100
@@ -37,6 +37,12 @@
 </div>
 
 <div class="document">
+<p>2023-01-24  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>VisualMagick/tests/runtest.bat Add missing tests of fileformats.</p></li>
+</ul>
+</blockquote>
 <p>2023-01-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">