From e3a26b77a482d78d34a5461752cda28e4520ae4a Mon Sep 17 00:00:00 2001
From: Josh Holmer <joshua.holmer@nextgearcapital.com>
Date: Sun, 10 Sep 2017 22:58:03 -0400
Subject: [PATCH] Fix a bug in reducing palettes with a bit depth of two

Closes #80
---
 CHANGELOG.md             |   1 +
 src/png.rs               |  10 +++++-----
 tests/files/issue-80.png | Bin 0 -> 1059 bytes
 tests/regression.rs      |  17 +++++++++++++++++
 4 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 tests/files/issue-80.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0aac5423..ee3258c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
     trials for optimizing the alpha channel, using the previously mentioned fast heuristic.
     This option will make optimization of images with transparency somewhat slower,
     but may improve compression.
+ - Fixed a bug in reducing palettes for images with bit depth of two([#80](https://github.com/shssoichiro/oxipng/issues/80))
  - Code cleanup
 
 ### Version 0.16.3
diff --git a/src/png.rs b/src/png.rs
index 0c0f19c4..5449d8a3 100644
--- a/src/png.rs
+++ b/src/png.rs
@@ -543,7 +543,7 @@ impl PngData {
                     for (i, bit) in bitvec.iter().enumerate() {
                         let mod_i = i % 4;
                         if bit {
-                            current += 2u8.pow(3u32 - mod_i as u32);
+                            current += 1u8 << (3 - mod_i);
                         }
                         if mod_i == 3 {
                             seen.insert(current);
@@ -557,7 +557,7 @@ impl PngData {
                     for (i, bit) in bitvec.iter().enumerate() {
                         let mod_i = i % 2;
                         if bit {
-                            current += 2u8.pow(1u32 - mod_i as u32);
+                            current += 1u8 << (1 - mod_i);
                         }
                         if mod_i == 1 {
                             seen.insert(current);
@@ -649,17 +649,17 @@ impl PngData {
                     new_byte |= if let Some(new_idx) = index_map.get(&one) {
                         *new_idx << 6
                     } else {
-                        one << 6
+                        one
                     };
                     new_byte |= if let Some(new_idx) = index_map.get(&two) {
                         *new_idx << 4
                     } else {
-                        two << 4
+                        two
                     };
                     new_byte |= if let Some(new_idx) = index_map.get(&three) {
                         *new_idx << 2
                     } else {
-                        three << 2
+                        three
                     };
                     new_byte |= if let Some(new_idx) = index_map.get(&four) {
                         *new_idx
diff --git a/tests/files/issue-80.png b/tests/files/issue-80.png
new file mode 100644
index 0000000000000000000000000000000000000000..15c819142205eca2a3924c42ab1f0e97d050debf
GIT binary patch
literal 1059
zcmeAS@N?(olHy`uVBq!ia0vp^6F``W8A#63;L-+CEa{HEjtmSN`?>!lvI6-E$sR$z
z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8U)v6XJU2%$b7>6951I
z-_op=0Tg6R@^*J&O5?6c0dm+&Jbhi+A9Bcx^NH*JFE(aiVEW_f;usQf`0e!5>+UG<
zwDq=p*LhGYvvTwIi4Xq9FHLZ2+L^K}$b2o^T<-$A4L=!$8TLJm{@0syPnoCj)BNXo
zb&Q)o<|{BixnQT%QZV7HY^!a`O(&)^ihtiI)?1xoUZVTNXAS>H&Rz250Sb*9oDzF2
z^#g=7`R_Tjxw1L_J+{!={n@-lzl1yF6rM<#vGOev)4kTiulk0e=jZY-pEkc(opq!#
zVrTo7LXB(<G2PF9IwiPIcwKlp{k&QlZ>v<*NAJ@|;}rI--qZZ+-(e=B^%ckN@vx}z
zN*`+Y7N%X+R`R`$F)%uJtwP5C<pnd|1<l^cm~_{$JGG^)N`Twe`R2^|3&i<*ceuz+
z5lz(Dl(ePRPg&!z@p)UxSxbyf0yiDm+Rkd?eNOmDnNjs*k4X%t=7>D3kr1A+*^+;k
zl&f#hxzyQB6E-b$EcH2;+OAc4?9Zefj*I#h%j|mDbc!qGgl5OemUp5leT+(<;<67+
z^8P*Jlbr6#UDpqIf8g!9bbCu@VBAhWb?w;|b9Uzx?=9G5^_IbPua&3RuBL!Bev)3X
zJG+&i_)m{I!~3N4xzwbM)~0(Tn<Qu5^)$G3SEizJc6sc6F0b`Gz8@n*+gl&4bK0hM
zRd`dh$D@OiPA?XIx_{=~o~A#nE9W|JWwkT={Ho$*WM>eaveIy#(1blJcV-G~{#@I>
z`sf?&yAx;rI#!jJ-y!nEzR~Pmgrk>9@zq}%B}_|qpR_2qJ>tFl>V>DS%QHkT+lKx9
zJAFrc)a-jzeT(OohR9b|dhwo3Xxp*kUVFfiqGDwq`|!&X;x<^ZoYudetEAKaXWvVS
zv%HFX8&B=~dNDRvD0H@7YVU2e(w{o_Yram%ohY@t?1$zN@s=HJDvDcYetov!s=(Y8
zk>3OE<z=pHo?fcBJk8c>x96@?D^-@2ajegm@e7|m@xSj1f9Xv2qwCh+byW&rf4fda
zRZB`P>_Vllk^l82MGsHi&rJDn!`bZG>e-dMb}25j{4|}_E|$rDm!H>(pGi{l7xu5)
zvEkR8KhyGmzCWFRsyXMfYW|OKVAfDAag8WRNi0dVN-jzTQVd20hUU5k7P`iUAw~vP
zh9*`<#@YtPRt5%(8}_rIXvob^$xN%nt>MyL_FX^?{9qe0i%as0N;32F7z~Y!jUBpF
RwgROXJYD@<);T3K0RVSA!*&1w

literal 0
HcmV?d00001

diff --git a/tests/regression.rs b/tests/regression.rs
index d8cf6d65..aaa63820 100644
--- a/tests/regression.rs
+++ b/tests/regression.rs
@@ -274,3 +274,20 @@ fn issue_60() {
         BitDepth::Eight,
     );
 }
+
+#[test]
+fn issue_80() {
+    let input = PathBuf::from("tests/files/issue-80.png");
+    let opts = get_opts(&input);
+    let output = opts.out_file.clone();
+
+    test_it_converts(
+        &input,
+        &output,
+        &opts,
+        ColorType::Indexed,
+        BitDepth::Two,
+        ColorType::Indexed,
+        BitDepth::One,
+    );
+}