From d6cc8a003b997e4d668d08300f439b1435fc7b21 Mon Sep 17 00:00:00 2001
From: Andrew <andrew@digerati.co.nz>
Date: Wed, 3 May 2023 21:47:08 +1200
Subject: [PATCH] Fix bKGD conversion from gray to palette

---
 src/reduction/color.rs | 42 ++++++++++++++++++++++++++++--------------
 tests/regression.rs    |  2 +-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/reduction/color.rs b/src/reduction/color.rs
index e8d5e73f..1dbc68ce 100644
--- a/src/reduction/color.rs
+++ b/src/reduction/color.rs
@@ -98,22 +98,36 @@ pub fn reduce_to_palette(png: &PngImage) -> Option<PngImage> {
 
     let mut aux_headers = png.aux_headers.clone();
     if let Some(bkgd_header) = png.aux_headers.get(b"bKGD") {
-        if bkgd_header.len() != 6 {
-            // malformed chunk?
-            return None;
-        }
-        // In bKGD 16-bit values are used even for 8-bit images
-        let bg = RGBA8::new(bkgd_header[1], bkgd_header[3], bkgd_header[5], 255);
-        let entry = if let Some(&entry) = palette.get(&bg) {
-            entry
-        } else if palette.len() < 256 {
-            let entry = palette.len() as u8;
-            palette.insert(bg, entry);
-            entry
+        let bg = if png.ihdr.color_type.is_rgb() && bkgd_header.len() == 6 {
+            // In bKGD 16-bit values are used even for 8-bit images
+            Some(RGBA8::new(
+                bkgd_header[1],
+                bkgd_header[3],
+                bkgd_header[5],
+                255,
+            ))
+        } else if png.ihdr.color_type == ColorType::GrayscaleAlpha && bkgd_header.len() == 2 {
+            Some(RGBA8::new(
+                bkgd_header[1],
+                bkgd_header[1],
+                bkgd_header[1],
+                255,
+            ))
         } else {
-            return None; // No space in palette to store the bg as an index
+            None
         };
-        aux_headers.insert(*b"bKGD", vec![entry]);
+        if let Some(bg) = bg {
+            let entry = if let Some(&entry) = palette.get(&bg) {
+                entry
+            } else if palette.len() < 256 {
+                let entry = palette.len() as u8;
+                palette.insert(bg, entry);
+                entry
+            } else {
+                return None; // No space in palette to store the bg as an index
+            };
+            aux_headers.insert(*b"bKGD", vec![entry]);
+        }
     }
 
     if let Some(sbit_header) = png.aux_headers.get(b"sBIT") {
diff --git a/tests/regression.rs b/tests/regression.rs
index a161a3bf..17f041a4 100644
--- a/tests/regression.rs
+++ b/tests/regression.rs
@@ -243,7 +243,7 @@ fn issue_60() {
         None,
         RGBA,
         BitDepth::Eight,
-        GRAYSCALE_ALPHA,
+        RGBA,
         BitDepth::Eight,
     );
 }