GraphicsMagick: coders/bmp.c Enforce default matte for 40 byte ...

GraphicsMagick Commits <[email protected]> Wed, 16 Aug 2023 19:06:55 -0500
Newsgroups gmane.comp.video.graphicsmagick.cvs
Message-ID <mailman.9635.1692230825.1374.graphicsmagick-commit@lists.sourceforge.net>
changeset 7af1b1f1d506 in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=7af1b1f1d506
summary: coders/bmp.c  Enforce default matte for 40 byte BMP header & 32bpp.

diffstat:

 ChangeLog    |  4 ++++
 coders/bmp.c |  3 ++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r 15a0fc19fa0c -r 7af1b1f1d506 ChangeLog
--- a/ChangeLog	Wed Aug 16 17:52:06 2023 -0500
+++ b/ChangeLog	Thu Aug 17 02:06:31 2023 +0200
@@ -1,3 +1,7 @@
+2023-08-17  Fojtik Jaroslav  <[email protected]>
+
+	* coders/bmp.c  Enforce default matte for 40 byte header & 32bpp.
+
 2023-08-16  Bob Friesenhahn  <[email protected]>
 
 	* coders/tiff.c (ReadTIFFImage): For common formats with the
diff -r 15a0fc19fa0c -r 7af1b1f1d506 coders/bmp.c
--- a/coders/bmp.c	Wed Aug 16 17:52:06 2023 -0500
+++ b/coders/bmp.c	Thu Aug 17 02:06:31 2023 +0200
@@ -1287,7 +1287,8 @@
                 }
               if ( bmp_info.bits_per_pixel == 32)
                 {
-                  bmp_info.alpha_mask=(image->matte ? 0xff000000U : 0U);
+                  image->matte = 1;
+                  bmp_info.alpha_mask=0xff000000U;
                   bmp_info.red_mask=0x00ff0000U;
                   bmp_info.green_mask=0x0000ff00U;
                   bmp_info.blue_mask=0x000000ffU;