GraphicsMagick: ReadTIFFImage(): Stop promoting RGB image to ass...

changeset 4e6d0c85f96f in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=4e6d0c85f96f
summary: ReadTIFFImage(): Stop promoting RGB image to associated alpha due to 4 channels

diffstat:

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

diffs (84 lines):

diff -r 9035beaece92 -r 4e6d0c85f96f ChangeLog
--- a/ChangeLog	Mon May 22 20:30:07 2023 -0500
+++ b/ChangeLog	Thu May 25 08:38:42 2023 -0500
@@ -1,3 +1,9 @@
+2023-05-25  Bob Friesenhahn  <[email protected]>
+
+	* coders/tiff.c (ReadTIFFImage): Stop promoting RGB image to
+	associated alpha due to 4 channels until a solution is found which
+	does not cause issues.
+
 2023-05-22  Bob Friesenhahn  <[email protected]>
 
 	* coders/tiff.c (ReadTIFFImage): Automate the collection of TIFF
diff -r 9035beaece92 -r 4e6d0c85f96f VisualMagick/installer/inc/version.isx
--- a/VisualMagick/installer/inc/version.isx	Mon May 22 20:30:07 2023 -0500
+++ b/VisualMagick/installer/inc/version.isx	Thu May 25 08:38:42 2023 -0500
@@ -10,5 +10,5 @@
 
 #define public MagickPackageName "GraphicsMagick"
 #define public MagickPackageVersion "1.4"
-#define public MagickPackageVersionAddendum ".020230522"
-#define public MagickPackageReleaseDate "snapshot-20230522"
+#define public MagickPackageVersionAddendum ".020230525"
+#define public MagickPackageReleaseDate "snapshot-20230525"
diff -r 9035beaece92 -r 4e6d0c85f96f coders/tiff.c
--- a/coders/tiff.c	Mon May 22 20:30:07 2023 -0500
+++ b/coders/tiff.c	Thu May 25 08:38:42 2023 -0500
@@ -2252,9 +2252,24 @@
       if (extra_samples == 0)
         if ((photometric == PHOTOMETRIC_RGB) && (samples_per_pixel == 4))
           {
+#if 0
+
+            /*
+              FIXME: Temporarily (?) disabled until a solution is found
+               which does not cause issues.
+            */
+            (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+                                  "Promoting RGB image to associated alpha due to"
+                                  " samples-per-pixel=%u", samples_per_pixel);
             extra_samples=1;
             alpha_type=AssociatedAlpha;
             image->matte=MagickTrue;
+#else
+            (void) LogMagickEvent(CoderEvent,GetMagickModule(),
+                                  "Photometric is RGB but %u samples/pixel provided!",
+                                  samples_per_pixel);
+            ThrowTIFFReaderException(CorruptImageError,ImproperImageHeader,image);
+#endif
           }
 
       /*
diff -r 9035beaece92 -r 4e6d0c85f96f magick/version.h
--- a/magick/version.h	Mon May 22 20:30:07 2023 -0500
+++ b/magick/version.h	Thu May 25 08:38:42 2023 -0500
@@ -38,8 +38,8 @@
 #define MagickLibVersion  0x272402
 #define MagickLibVersionText  "1.4"
 #define MagickLibVersionNumber 27,24,2
-#define MagickChangeDate   "20230522"
-#define MagickReleaseDate  "snapshot-20230522"
+#define MagickChangeDate   "20230525"
+#define MagickReleaseDate  "snapshot-20230525"
 
 /*
   The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines
diff -r 9035beaece92 -r 4e6d0c85f96f www/Changelog.html
--- a/www/Changelog.html	Mon May 22 20:30:07 2023 -0500
+++ b/www/Changelog.html	Thu May 25 08:38:42 2023 -0500
@@ -37,6 +37,14 @@
 </div>
 
 <div class="document">
+<p>2023-05-25  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/tiff.c (ReadTIFFImage): Stop promoting RGB image to
+associated alpha due to 4 channels until a solution is found which
+does not cause issues.</p></li>
+</ul>
+</blockquote>
 <p>2023-05-22  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">