GraphicsMagick: coders/bmp.c Enforce default color masks when bm...

changeset 47dd1b9878ef in /hg/GraphicsMagick
details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=47dd1b9878ef
summary: coders/bmp.c Enforce default color masks when bmp_info.compression==BI_RGB.

diffstat:

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

diffs (26 lines):

diff -r 73f00b8d83ef -r 47dd1b9878ef ChangeLog
--- a/ChangeLog	Thu Aug 17 09:57:52 2023 +0200
+++ b/ChangeLog	Thu Aug 17 10:24:13 2023 +0200
@@ -4,6 +4,9 @@
 	bpp than 8. It overcomes quantum scalling error in gm. Code should
 	be redesigned, but it is better than previous state.
 
+        Enforce default color masks when bmp_info.compression==BI_RGB
+	Existing masks will be ignored.
+
 2023-08-17  Fojtik Jaroslav  <[email protected]>
 
 	* coders/bmp.c  Enforce default matte for 40 byte header & 32bpp.
diff -r 73f00b8d83ef -r 47dd1b9878ef coders/bmp.c
--- a/coders/bmp.c	Thu Aug 17 09:57:52 2023 +0200
+++ b/coders/bmp.c	Thu Aug 17 10:24:13 2023 +0200
@@ -1277,7 +1277,8 @@
             sample;
 
           /* Use defaults for 40 bytes header and also a reminder of a culture of sloth. */
-          if (bmp_info.red_mask==0 && bmp_info.green_mask==0 && bmp_info.blue_mask==0 && bmp_info.alpha_mask==0)
+          if(bmp_info.compression == BI_RGB ||
+             (bmp_info.red_mask==0 && bmp_info.green_mask==0 && bmp_info.blue_mask==0 && bmp_info.alpha_mask==0))
             {
               if (bmp_info.bits_per_pixel == 16)          /* USE BMP 565 */
                 {