From b846a2e9092cf1c2aaf489e9c240e56840fd6652 Mon Sep 17 00:00:00 2001
From: andrews05 <andrew@digerati.co.nz>
Date: Sat, 8 Jul 2023 12:56:15 +1200
Subject: [PATCH] Try to pick tRNS value that's valid at low depth (#520)

---
 src/reduction/alpha.rs                           |  10 +++++++++-
 ...yscale_alpha_8_should_be_grayscale_trns_1.png | Bin 0 -> 2361 bytes
 tests/reduction.rs                               |  12 ++++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 tests/files/grayscale_alpha_8_should_be_grayscale_trns_1.png

diff --git a/src/reduction/alpha.rs b/src/reduction/alpha.rs
index 3045ddf6..3115c6cd 100644
--- a/src/reduction/alpha.rs
+++ b/src/reduction/alpha.rs
@@ -57,8 +57,16 @@ pub fn reduced_alpha_channel(png: &PngImage, optimize_alpha: bool) -> Option<Png
     }
 
     let transparency_pixel = if has_transparency {
+        // For grayscale, start by checking 4 specific values in the hope that we may reduce depth
+        let unused = match png.ihdr.color_type {
+            ColorType::GrayscaleAlpha => [0x00, 0xFF, 0x55, 0xAA]
+                .into_iter()
+                .find(|&v| !used_colors[v as usize]),
+            _ => None,
+        }
+        .or_else(|| used_colors.iter().position(|&u| !u).map(|v| v as u8));
         // If no unused color was found we will have to fail here
-        Some(used_colors.iter().position(|b| !*b)? as u8)
+        Some(unused?)
     } else {
         None
     };
diff --git a/tests/files/grayscale_alpha_8_should_be_grayscale_trns_1.png b/tests/files/grayscale_alpha_8_should_be_grayscale_trns_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3434291fc4ad3bcb0042b29f26da7f024c70a6b3
GIT binary patch
literal 2361
zcmeHI&1(}u6o1>K5K~hH3zimPjo5>d{i=y(*(}7wnuuF!tTh#pZqrR&Om>&uE!lbs
zDpo;gk5Y;h1@)rnO?oQyFA$*@FCMG(B*lXib!PL?H8vN|8F<W_-+R9|Z{EDweLOaL
zF%%pK0zfF6N#_8F9VANuKSI8*-H_1apG`_hfcJ|%yK*;LlZ8wU;dh4sst*8uBB;6r
zFvkFVn*!jU0vt6~)~*Q1@J`8Ri;@JVkRE_;VgPUi0?8#}u&L(=7P=7DkK_iyxq2Vc
z%>@;3BG~^S5<D_U@Y<b6O7p5VOG=7tlgWZ^YGjm(Q8C~cZkT6cJR2ohmgl1U@HqhA
zDgi#1jrglwjmX5#s;{XpAv=7%_WBK)4j7q93!vu+76O)6P<lQ|9naf&=`vr?%alB$
zPb-vDHZThWhev8zv1QUJmo$ra5@FYaM>>Y-FzLG3cM{>eG)AU$Qz2s%Los17NRp&r
z&J_7vdZbQAt3>#=Z5upIS1J{%GEC{_EX~H_ahl<1j*B3Vh&8X-vJ=s)6SW|XIBCTy
zn5to`x<=x-^0Yo@C&FR8QFGMuEE~;@G^>6pbUxaV4VtAGdOwolsC()C#ln`hG+QmU
zp<zpn<`$!tqkt;Pr%ZIex;d`vC9%zo3v{dF-Z|YEl0Ksr=hL#Sh`2c-Of14i#~aO2
zqkDWjY<wJkOm&n}KCPA&%|aCw&oJ?rK<{g6rKa?fZeBIyf+DhYiU(@-b~l=Azmdn}
zq2k){DZOl%isj}P73hDkR{wlXvGmd$?hx@TS0{MER>I_d1TR=82sCauPXpGv+eJ}(
zi$PTG##0f4-7mQx=p(b7O((~lTic(A5HNvt#{B(k@zCbz#?bcZ>zjjLgcqsm$K&f;
zho|fS!~6S>bv@}NMi!t0cWTmUi2r{L^5<7R{5yr@ug&{6dqa<Uea|<lTMWq`?5MRm
Y_$T^yPktaKXk4c3h0*le^HcZ!0FX_#UjP6A

literal 0
HcmV?d00001

diff --git a/tests/reduction.rs b/tests/reduction.rs
index 8a1a1e34..7176ccca 100644
--- a/tests/reduction.rs
+++ b/tests/reduction.rs
@@ -916,6 +916,18 @@ fn grayscale_alpha_8_should_be_grayscale_trns_8() {
     );
 }
 
+#[test]
+fn grayscale_alpha_8_should_be_grayscale_trns_1() {
+    test_it_converts(
+        "tests/files/grayscale_alpha_8_should_be_grayscale_trns_1.png",
+        true,
+        GRAYSCALE_ALPHA,
+        BitDepth::Eight,
+        GRAYSCALE,
+        BitDepth::One,
+    );
+}
+
 #[test]
 fn small_files() {
     test_it_converts(