diff --git a/contrib/testpngs/gray-1-1.8-tRNS.png b/contrib/testpngs/gray-1-1.8-tRNS.png
new file mode 100644
index 000000000..85283b147
Binary files /dev/null and b/contrib/testpngs/gray-1-1.8-tRNS.png differ
diff --git a/contrib/testpngs/gray-1-1.8.png b/contrib/testpngs/gray-1-1.8.png
index ee22ab161..6f1415c43 100644
Binary files a/contrib/testpngs/gray-1-1.8.png and b/contrib/testpngs/gray-1-1.8.png differ
diff --git a/contrib/testpngs/gray-1-linear-tRNS.png b/contrib/testpngs/gray-1-linear-tRNS.png
new file mode 100644
index 000000000..b6557eb56
Binary files /dev/null and b/contrib/testpngs/gray-1-linear-tRNS.png differ
diff --git a/contrib/testpngs/gray-1-linear.png b/contrib/testpngs/gray-1-linear.png
index b82228654..5c2fac6d9 100644
Binary files a/contrib/testpngs/gray-1-linear.png and b/contrib/testpngs/gray-1-linear.png differ
diff --git a/contrib/testpngs/gray-1-sRGB-tRNS.png b/contrib/testpngs/gray-1-sRGB-tRNS.png
new file mode 100644
index 000000000..cb381f6a8
Binary files /dev/null and b/contrib/testpngs/gray-1-sRGB-tRNS.png differ
diff --git a/contrib/testpngs/gray-1-sRGB.png b/contrib/testpngs/gray-1-sRGB.png
index baccc7652..2dc5c6efc 100644
Binary files a/contrib/testpngs/gray-1-sRGB.png and b/contrib/testpngs/gray-1-sRGB.png differ
diff --git a/contrib/testpngs/gray-1-tRNS.png b/contrib/testpngs/gray-1-tRNS.png
new file mode 100644
index 000000000..d173b6ad7
Binary files /dev/null and b/contrib/testpngs/gray-1-tRNS.png differ
diff --git a/contrib/testpngs/gray-1.png b/contrib/testpngs/gray-1.png
index 9f500ff94..931d27e93 100644
Binary files a/contrib/testpngs/gray-1.png and b/contrib/testpngs/gray-1.png differ
diff --git a/contrib/testpngs/gray-16-1.8-tRNS.png b/contrib/testpngs/gray-16-1.8-tRNS.png
new file mode 100644
index 000000000..a1664619e
Binary files /dev/null and b/contrib/testpngs/gray-16-1.8-tRNS.png differ
diff --git a/contrib/testpngs/gray-16-1.8.png b/contrib/testpngs/gray-16-1.8.png
index 0b61902a0..a1664619e 100644
Binary files a/contrib/testpngs/gray-16-1.8.png and b/contrib/testpngs/gray-16-1.8.png differ
diff --git a/contrib/testpngs/gray-16-linear-tRNS.png b/contrib/testpngs/gray-16-linear-tRNS.png
new file mode 100644
index 000000000..86fbcd1dc
Binary files /dev/null and b/contrib/testpngs/gray-16-linear-tRNS.png differ
diff --git a/contrib/testpngs/gray-16-linear.png b/contrib/testpngs/gray-16-linear.png
index 14af96be7..86fbcd1dc 100644
Binary files a/contrib/testpngs/gray-16-linear.png and b/contrib/testpngs/gray-16-linear.png differ
diff --git a/contrib/testpngs/gray-16-sRGB-tRNS.png b/contrib/testpngs/gray-16-sRGB-tRNS.png
new file mode 100644
index 000000000..92c5fa723
Binary files /dev/null and b/contrib/testpngs/gray-16-sRGB-tRNS.png differ
diff --git a/contrib/testpngs/gray-16-sRGB.png b/contrib/testpngs/gray-16-sRGB.png
index 4eeb86558..92c5fa723 100644
Binary files a/contrib/testpngs/gray-16-sRGB.png and b/contrib/testpngs/gray-16-sRGB.png differ
diff --git a/contrib/testpngs/gray-16-tRNS.png b/contrib/testpngs/gray-16-tRNS.png
new file mode 100644
index 000000000..7dcff96e2
Binary files /dev/null and b/contrib/testpngs/gray-16-tRNS.png differ
diff --git a/contrib/testpngs/gray-16.png b/contrib/testpngs/gray-16.png
index dc12126e0..7dcff96e2 100644
Binary files a/contrib/testpngs/gray-16.png and b/contrib/testpngs/gray-16.png differ
diff --git a/contrib/testpngs/gray-2-1.8-tRNS.png b/contrib/testpngs/gray-2-1.8-tRNS.png
new file mode 100644
index 000000000..de7711070
Binary files /dev/null and b/contrib/testpngs/gray-2-1.8-tRNS.png differ
diff --git a/contrib/testpngs/gray-2-1.8.png b/contrib/testpngs/gray-2-1.8.png
index 03e46655b..765195d20 100644
Binary files a/contrib/testpngs/gray-2-1.8.png and b/contrib/testpngs/gray-2-1.8.png differ
diff --git a/contrib/testpngs/gray-2-linear-tRNS.png b/contrib/testpngs/gray-2-linear-tRNS.png
new file mode 100644
index 000000000..b47fa6f81
Binary files /dev/null and b/contrib/testpngs/gray-2-linear-tRNS.png differ
diff --git a/contrib/testpngs/gray-2-linear.png b/contrib/testpngs/gray-2-linear.png
index 29496223a..be05b6739 100644
Binary files a/contrib/testpngs/gray-2-linear.png and b/contrib/testpngs/gray-2-linear.png differ
diff --git a/contrib/testpngs/gray-2-sRGB-tRNS.png b/contrib/testpngs/gray-2-sRGB-tRNS.png
new file mode 100644
index 000000000..e59afd34f
Binary files /dev/null and b/contrib/testpngs/gray-2-sRGB-tRNS.png differ
diff --git a/contrib/testpngs/gray-2-sRGB.png b/contrib/testpngs/gray-2-sRGB.png
index 5e7b2f0dd..5a41961b6 100644
Binary files a/contrib/testpngs/gray-2-sRGB.png and b/contrib/testpngs/gray-2-sRGB.png differ
diff --git a/contrib/testpngs/gray-2-tRNS.png b/contrib/testpngs/gray-2-tRNS.png
new file mode 100644
index 000000000..b561fa7d2
Binary files /dev/null and b/contrib/testpngs/gray-2-tRNS.png differ
diff --git a/contrib/testpngs/gray-2.png b/contrib/testpngs/gray-2.png
index 40aaf245b..43c33a2b1 100644
Binary files a/contrib/testpngs/gray-2.png and b/contrib/testpngs/gray-2.png differ
diff --git a/contrib/testpngs/gray-4-1.8-tRNS.png b/contrib/testpngs/gray-4-1.8-tRNS.png
new file mode 100644
index 000000000..3d2421f20
Binary files /dev/null and b/contrib/testpngs/gray-4-1.8-tRNS.png differ
diff --git a/contrib/testpngs/gray-4-1.8.png b/contrib/testpngs/gray-4-1.8.png
index 0ac22140e..58ab65f74 100644
Binary files a/contrib/testpngs/gray-4-1.8.png and b/contrib/testpngs/gray-4-1.8.png differ
diff --git a/contrib/testpngs/gray-4-linear-tRNS.png b/contrib/testpngs/gray-4-linear-tRNS.png
new file mode 100644
index 000000000..06ed70243
Binary files /dev/null and b/contrib/testpngs/gray-4-linear-tRNS.png differ
diff --git a/contrib/testpngs/gray-4-linear.png b/contrib/testpngs/gray-4-linear.png
index 5555c7131..7c2db7339 100644
Binary files a/contrib/testpngs/gray-4-linear.png and b/contrib/testpngs/gray-4-linear.png differ
diff --git a/contrib/testpngs/gray-4-sRGB-tRNS.png b/contrib/testpngs/gray-4-sRGB-tRNS.png
new file mode 100644
index 000000000..6f15c1a43
Binary files /dev/null and b/contrib/testpngs/gray-4-sRGB-tRNS.png differ
diff --git a/contrib/testpngs/gray-4-sRGB.png b/contrib/testpngs/gray-4-sRGB.png
index 72831561c..c7dfa7512 100644
Binary files a/contrib/testpngs/gray-4-sRGB.png and b/contrib/testpngs/gray-4-sRGB.png differ
diff --git a/contrib/testpngs/gray-4-tRNS.png b/contrib/testpngs/gray-4-tRNS.png
new file mode 100644
index 000000000..838cacf9e
Binary files /dev/null and b/contrib/testpngs/gray-4-tRNS.png differ
diff --git a/contrib/testpngs/gray-4.png b/contrib/testpngs/gray-4.png
index 2fd4290d3..530b46c26 100644
Binary files a/contrib/testpngs/gray-4.png and b/contrib/testpngs/gray-4.png differ
diff --git a/contrib/testpngs/gray-8-1.8-tRNS.png b/contrib/testpngs/gray-8-1.8-tRNS.png
new file mode 100644
index 000000000..0c50804c5
Binary files /dev/null and b/contrib/testpngs/gray-8-1.8-tRNS.png differ
diff --git a/contrib/testpngs/gray-8-1.8.png b/contrib/testpngs/gray-8-1.8.png
index 4f3873d15..02cfd3e35 100644
Binary files a/contrib/testpngs/gray-8-1.8.png and b/contrib/testpngs/gray-8-1.8.png differ
diff --git a/contrib/testpngs/gray-8-linear-tRNS.png b/contrib/testpngs/gray-8-linear-tRNS.png
new file mode 100644
index 000000000..e2a199539
Binary files /dev/null and b/contrib/testpngs/gray-8-linear-tRNS.png differ
diff --git a/contrib/testpngs/gray-8-linear.png b/contrib/testpngs/gray-8-linear.png
index 068533d44..278aa37ea 100644
Binary files a/contrib/testpngs/gray-8-linear.png and b/contrib/testpngs/gray-8-linear.png differ
diff --git a/contrib/testpngs/gray-8-sRGB-tRNS.png b/contrib/testpngs/gray-8-sRGB-tRNS.png
new file mode 100644
index 000000000..1584b17e6
Binary files /dev/null and b/contrib/testpngs/gray-8-sRGB-tRNS.png differ
diff --git a/contrib/testpngs/gray-8-sRGB.png b/contrib/testpngs/gray-8-sRGB.png
index ccad797f2..62f5f707c 100644
Binary files a/contrib/testpngs/gray-8-sRGB.png and b/contrib/testpngs/gray-8-sRGB.png differ
diff --git a/contrib/testpngs/gray-8-tRNS.png b/contrib/testpngs/gray-8-tRNS.png
new file mode 100644
index 000000000..e09e888ee
Binary files /dev/null and b/contrib/testpngs/gray-8-tRNS.png differ
diff --git a/contrib/testpngs/gray-8.png b/contrib/testpngs/gray-8.png
index ceac2efc8..321fa06ab 100644
Binary files a/contrib/testpngs/gray-8.png and b/contrib/testpngs/gray-8.png differ
diff --git a/contrib/testpngs/gray-alpha-16-1.8.png b/contrib/testpngs/gray-alpha-16-1.8.png
index fd2a0512a..383852c35 100644
Binary files a/contrib/testpngs/gray-alpha-16-1.8.png and b/contrib/testpngs/gray-alpha-16-1.8.png differ
diff --git a/contrib/testpngs/gray-alpha-16-linear.png b/contrib/testpngs/gray-alpha-16-linear.png
index e8a7e8c36..68f632938 100644
Binary files a/contrib/testpngs/gray-alpha-16-linear.png and b/contrib/testpngs/gray-alpha-16-linear.png differ
diff --git a/contrib/testpngs/gray-alpha-16-sRGB.png b/contrib/testpngs/gray-alpha-16-sRGB.png
index 1e76d3d00..9bedb6e87 100644
Binary files a/contrib/testpngs/gray-alpha-16-sRGB.png and b/contrib/testpngs/gray-alpha-16-sRGB.png differ
diff --git a/contrib/testpngs/gray-alpha-16.png b/contrib/testpngs/gray-alpha-16.png
index 083a05a6d..38f4de8b3 100644
Binary files a/contrib/testpngs/gray-alpha-16.png and b/contrib/testpngs/gray-alpha-16.png differ
diff --git a/contrib/testpngs/gray-alpha-8-1.8.png b/contrib/testpngs/gray-alpha-8-1.8.png
index ef9e9c72f..559a7b570 100644
Binary files a/contrib/testpngs/gray-alpha-8-1.8.png and b/contrib/testpngs/gray-alpha-8-1.8.png differ
diff --git a/contrib/testpngs/gray-alpha-8-linear.png b/contrib/testpngs/gray-alpha-8-linear.png
index 0d9557cee..f56f260d7 100644
Binary files a/contrib/testpngs/gray-alpha-8-linear.png and b/contrib/testpngs/gray-alpha-8-linear.png differ
diff --git a/contrib/testpngs/gray-alpha-8-sRGB.png b/contrib/testpngs/gray-alpha-8-sRGB.png
index db489e1d8..72ea34fcd 100644
Binary files a/contrib/testpngs/gray-alpha-8-sRGB.png and b/contrib/testpngs/gray-alpha-8-sRGB.png differ
diff --git a/contrib/testpngs/gray-alpha-8.png b/contrib/testpngs/gray-alpha-8.png
index fdfb89d96..9f0a053f3 100644
Binary files a/contrib/testpngs/gray-alpha-8.png and b/contrib/testpngs/gray-alpha-8.png differ
diff --git a/contrib/testpngs/palette-1-1.8-tRNS.png b/contrib/testpngs/palette-1-1.8-tRNS.png
new file mode 100644
index 000000000..6467254a0
Binary files /dev/null and b/contrib/testpngs/palette-1-1.8-tRNS.png differ
diff --git a/contrib/testpngs/palette-1-1.8.png b/contrib/testpngs/palette-1-1.8.png
index e6abd01c7..053cefb51 100644
Binary files a/contrib/testpngs/palette-1-1.8.png and b/contrib/testpngs/palette-1-1.8.png differ
diff --git a/contrib/testpngs/palette-1-linear-tRNS.png b/contrib/testpngs/palette-1-linear-tRNS.png
new file mode 100644
index 000000000..67ae7bbf6
Binary files /dev/null and b/contrib/testpngs/palette-1-linear-tRNS.png differ
diff --git a/contrib/testpngs/palette-1-linear.png b/contrib/testpngs/palette-1-linear.png
index 7c1988a8f..057fb17d6 100644
Binary files a/contrib/testpngs/palette-1-linear.png and b/contrib/testpngs/palette-1-linear.png differ
diff --git a/contrib/testpngs/palette-1-sRGB-tRNS.png b/contrib/testpngs/palette-1-sRGB-tRNS.png
new file mode 100644
index 000000000..f5198432b
Binary files /dev/null and b/contrib/testpngs/palette-1-sRGB-tRNS.png differ
diff --git a/contrib/testpngs/palette-1-sRGB.png b/contrib/testpngs/palette-1-sRGB.png
index 6745f9a3f..faea26ed3 100644
Binary files a/contrib/testpngs/palette-1-sRGB.png and b/contrib/testpngs/palette-1-sRGB.png differ
diff --git a/contrib/testpngs/palette-1-tRNS.png b/contrib/testpngs/palette-1-tRNS.png
new file mode 100644
index 000000000..784a8e349
Binary files /dev/null and b/contrib/testpngs/palette-1-tRNS.png differ
diff --git a/contrib/testpngs/palette-1.png b/contrib/testpngs/palette-1.png
index 58e8246ee..0d6da4c8f 100644
Binary files a/contrib/testpngs/palette-1.png and b/contrib/testpngs/palette-1.png differ
diff --git a/contrib/testpngs/palette-2-1.8-tRNS.png b/contrib/testpngs/palette-2-1.8-tRNS.png
new file mode 100644
index 000000000..06e88c7c3
Binary files /dev/null and b/contrib/testpngs/palette-2-1.8-tRNS.png differ
diff --git a/contrib/testpngs/palette-2-1.8.png b/contrib/testpngs/palette-2-1.8.png
index 009256ab7..fed192c33 100644
Binary files a/contrib/testpngs/palette-2-1.8.png and b/contrib/testpngs/palette-2-1.8.png differ
diff --git a/contrib/testpngs/palette-2-linear-tRNS.png b/contrib/testpngs/palette-2-linear-tRNS.png
new file mode 100644
index 000000000..770798d26
Binary files /dev/null and b/contrib/testpngs/palette-2-linear-tRNS.png differ
diff --git a/contrib/testpngs/palette-2-linear.png b/contrib/testpngs/palette-2-linear.png
index d3a1c8ff1..e471b327a 100644
Binary files a/contrib/testpngs/palette-2-linear.png and b/contrib/testpngs/palette-2-linear.png differ
diff --git a/contrib/testpngs/palette-2-sRGB-tRNS.png b/contrib/testpngs/palette-2-sRGB-tRNS.png
new file mode 100644
index 000000000..1ba7729ee
Binary files /dev/null and b/contrib/testpngs/palette-2-sRGB-tRNS.png differ
diff --git a/contrib/testpngs/palette-2-sRGB.png b/contrib/testpngs/palette-2-sRGB.png
index c2016666a..8c905cd20 100644
Binary files a/contrib/testpngs/palette-2-sRGB.png and b/contrib/testpngs/palette-2-sRGB.png differ
diff --git a/contrib/testpngs/palette-2-tRNS.png b/contrib/testpngs/palette-2-tRNS.png
new file mode 100644
index 000000000..034783fb1
Binary files /dev/null and b/contrib/testpngs/palette-2-tRNS.png differ
diff --git a/contrib/testpngs/palette-2.png b/contrib/testpngs/palette-2.png
index 9042640a1..fe6572eb5 100644
Binary files a/contrib/testpngs/palette-2.png and b/contrib/testpngs/palette-2.png differ
diff --git a/contrib/testpngs/palette-4-1.8-tRNS.png b/contrib/testpngs/palette-4-1.8-tRNS.png
new file mode 100644
index 000000000..a4427594d
Binary files /dev/null and b/contrib/testpngs/palette-4-1.8-tRNS.png differ
diff --git a/contrib/testpngs/palette-4-1.8.png b/contrib/testpngs/palette-4-1.8.png
index 24a5c3f8a..3227be220 100644
Binary files a/contrib/testpngs/palette-4-1.8.png and b/contrib/testpngs/palette-4-1.8.png differ
diff --git a/contrib/testpngs/palette-4-linear-tRNS.png b/contrib/testpngs/palette-4-linear-tRNS.png
new file mode 100644
index 000000000..931ad53eb
Binary files /dev/null and b/contrib/testpngs/palette-4-linear-tRNS.png differ
diff --git a/contrib/testpngs/palette-4-linear.png b/contrib/testpngs/palette-4-linear.png
index 54ba29c4d..3901dba11 100644
Binary files a/contrib/testpngs/palette-4-linear.png and b/contrib/testpngs/palette-4-linear.png differ
diff --git a/contrib/testpngs/palette-4-sRGB-tRNS.png b/contrib/testpngs/palette-4-sRGB-tRNS.png
new file mode 100644
index 000000000..84bf60b35
Binary files /dev/null and b/contrib/testpngs/palette-4-sRGB-tRNS.png differ
diff --git a/contrib/testpngs/palette-4-sRGB.png b/contrib/testpngs/palette-4-sRGB.png
index a4765253f..f24a4d896 100644
Binary files a/contrib/testpngs/palette-4-sRGB.png and b/contrib/testpngs/palette-4-sRGB.png differ
diff --git a/contrib/testpngs/palette-4-tRNS.png b/contrib/testpngs/palette-4-tRNS.png
new file mode 100644
index 000000000..29d6ea205
Binary files /dev/null and b/contrib/testpngs/palette-4-tRNS.png differ
diff --git a/contrib/testpngs/palette-4.png b/contrib/testpngs/palette-4.png
index b6806df45..edcd25005 100644
Binary files a/contrib/testpngs/palette-4.png and b/contrib/testpngs/palette-4.png differ
diff --git a/contrib/testpngs/palette-8-1.8-tRNS.png b/contrib/testpngs/palette-8-1.8-tRNS.png
new file mode 100644
index 000000000..ccef008fd
Binary files /dev/null and b/contrib/testpngs/palette-8-1.8-tRNS.png differ
diff --git a/contrib/testpngs/palette-8-1.8.png b/contrib/testpngs/palette-8-1.8.png
index e20b07707..cbfac4a41 100644
Binary files a/contrib/testpngs/palette-8-1.8.png and b/contrib/testpngs/palette-8-1.8.png differ
diff --git a/contrib/testpngs/palette-8-linear-tRNS.png b/contrib/testpngs/palette-8-linear-tRNS.png
new file mode 100644
index 000000000..50f819e69
Binary files /dev/null and b/contrib/testpngs/palette-8-linear-tRNS.png differ
diff --git a/contrib/testpngs/palette-8-linear.png b/contrib/testpngs/palette-8-linear.png
index 1f2e1f28e..4a2292bc9 100644
Binary files a/contrib/testpngs/palette-8-linear.png and b/contrib/testpngs/palette-8-linear.png differ
diff --git a/contrib/testpngs/palette-8-sRGB-tRNS.png b/contrib/testpngs/palette-8-sRGB-tRNS.png
new file mode 100644
index 000000000..a834c154c
Binary files /dev/null and b/contrib/testpngs/palette-8-sRGB-tRNS.png differ
diff --git a/contrib/testpngs/palette-8-sRGB.png b/contrib/testpngs/palette-8-sRGB.png
index 49bcb4106..67c9b09b9 100644
Binary files a/contrib/testpngs/palette-8-sRGB.png and b/contrib/testpngs/palette-8-sRGB.png differ
diff --git a/contrib/testpngs/palette-8-tRNS.png b/contrib/testpngs/palette-8-tRNS.png
new file mode 100644
index 000000000..f7d717ecc
Binary files /dev/null and b/contrib/testpngs/palette-8-tRNS.png differ
diff --git a/contrib/testpngs/palette-8.png b/contrib/testpngs/palette-8.png
index ffa206864..edbdff8d5 100644
Binary files a/contrib/testpngs/palette-8.png and b/contrib/testpngs/palette-8.png differ
diff --git a/contrib/testpngs/rgb-16-1.8-tRNS.png b/contrib/testpngs/rgb-16-1.8-tRNS.png
new file mode 100644
index 000000000..b36e8094d
Binary files /dev/null and b/contrib/testpngs/rgb-16-1.8-tRNS.png differ
diff --git a/contrib/testpngs/rgb-16-1.8.png b/contrib/testpngs/rgb-16-1.8.png
index b58f18553..b36e8094d 100644
Binary files a/contrib/testpngs/rgb-16-1.8.png and b/contrib/testpngs/rgb-16-1.8.png differ
diff --git a/contrib/testpngs/rgb-16-linear-tRNS.png b/contrib/testpngs/rgb-16-linear-tRNS.png
new file mode 100644
index 000000000..4956a9b98
Binary files /dev/null and b/contrib/testpngs/rgb-16-linear-tRNS.png differ
diff --git a/contrib/testpngs/rgb-16-linear.png b/contrib/testpngs/rgb-16-linear.png
index 82d22cd46..4956a9b98 100644
Binary files a/contrib/testpngs/rgb-16-linear.png and b/contrib/testpngs/rgb-16-linear.png differ
diff --git a/contrib/testpngs/rgb-16-sRGB-tRNS.png b/contrib/testpngs/rgb-16-sRGB-tRNS.png
new file mode 100644
index 000000000..fd3a8e221
Binary files /dev/null and b/contrib/testpngs/rgb-16-sRGB-tRNS.png differ
diff --git a/contrib/testpngs/rgb-16-sRGB.png b/contrib/testpngs/rgb-16-sRGB.png
index 7b7dcdf69..fd3a8e221 100644
Binary files a/contrib/testpngs/rgb-16-sRGB.png and b/contrib/testpngs/rgb-16-sRGB.png differ
diff --git a/contrib/testpngs/rgb-16-tRNS.png b/contrib/testpngs/rgb-16-tRNS.png
new file mode 100644
index 000000000..450ff9134
Binary files /dev/null and b/contrib/testpngs/rgb-16-tRNS.png differ
diff --git a/contrib/testpngs/rgb-16.png b/contrib/testpngs/rgb-16.png
index cfd89148d..450ff9134 100644
Binary files a/contrib/testpngs/rgb-16.png and b/contrib/testpngs/rgb-16.png differ
diff --git a/contrib/testpngs/rgb-8-1.8-tRNS.png b/contrib/testpngs/rgb-8-1.8-tRNS.png
new file mode 100644
index 000000000..7b0c8b9ad
Binary files /dev/null and b/contrib/testpngs/rgb-8-1.8-tRNS.png differ
diff --git a/contrib/testpngs/rgb-8-1.8.png b/contrib/testpngs/rgb-8-1.8.png
index 0bbc836aa..3df5782d9 100644
Binary files a/contrib/testpngs/rgb-8-1.8.png and b/contrib/testpngs/rgb-8-1.8.png differ
diff --git a/contrib/testpngs/rgb-8-linear-tRNS.png b/contrib/testpngs/rgb-8-linear-tRNS.png
new file mode 100644
index 000000000..3e60b03b6
Binary files /dev/null and b/contrib/testpngs/rgb-8-linear-tRNS.png differ
diff --git a/contrib/testpngs/rgb-8-linear.png b/contrib/testpngs/rgb-8-linear.png
index 47ca3745c..0c36bcce6 100644
Binary files a/contrib/testpngs/rgb-8-linear.png and b/contrib/testpngs/rgb-8-linear.png differ
diff --git a/contrib/testpngs/rgb-8-sRGB-tRNS.png b/contrib/testpngs/rgb-8-sRGB-tRNS.png
new file mode 100644
index 000000000..4c349ee62
Binary files /dev/null and b/contrib/testpngs/rgb-8-sRGB-tRNS.png differ
diff --git a/contrib/testpngs/rgb-8-sRGB.png b/contrib/testpngs/rgb-8-sRGB.png
index 2c3acd8b7..90ef10c5d 100644
Binary files a/contrib/testpngs/rgb-8-sRGB.png and b/contrib/testpngs/rgb-8-sRGB.png differ
diff --git a/contrib/testpngs/rgb-8-tRNS.png b/contrib/testpngs/rgb-8-tRNS.png
new file mode 100644
index 000000000..3d974fe58
Binary files /dev/null and b/contrib/testpngs/rgb-8-tRNS.png differ
diff --git a/contrib/testpngs/rgb-8.png b/contrib/testpngs/rgb-8.png
index 2122fce82..838219d5a 100644
Binary files a/contrib/testpngs/rgb-8.png and b/contrib/testpngs/rgb-8.png differ
diff --git a/contrib/testpngs/rgb-alpha-16-1.8.png b/contrib/testpngs/rgb-alpha-16-1.8.png
index 0a97eb38c..931113f22 100644
Binary files a/contrib/testpngs/rgb-alpha-16-1.8.png and b/contrib/testpngs/rgb-alpha-16-1.8.png differ
diff --git a/contrib/testpngs/rgb-alpha-16-linear.png b/contrib/testpngs/rgb-alpha-16-linear.png
index 6c8eefb2f..fccf8cf4f 100644
Binary files a/contrib/testpngs/rgb-alpha-16-linear.png and b/contrib/testpngs/rgb-alpha-16-linear.png differ
diff --git a/contrib/testpngs/rgb-alpha-16-sRGB.png b/contrib/testpngs/rgb-alpha-16-sRGB.png
index 8ef615d8f..009ef1824 100644
Binary files a/contrib/testpngs/rgb-alpha-16-sRGB.png and b/contrib/testpngs/rgb-alpha-16-sRGB.png differ
diff --git a/contrib/testpngs/rgb-alpha-16.png b/contrib/testpngs/rgb-alpha-16.png
index 597f174ec..384025712 100644
Binary files a/contrib/testpngs/rgb-alpha-16.png and b/contrib/testpngs/rgb-alpha-16.png differ
diff --git a/contrib/testpngs/rgb-alpha-8-1.8.png b/contrib/testpngs/rgb-alpha-8-1.8.png
index b49149a33..ae0049552 100644
Binary files a/contrib/testpngs/rgb-alpha-8-1.8.png and b/contrib/testpngs/rgb-alpha-8-1.8.png differ
diff --git a/contrib/testpngs/rgb-alpha-8-linear.png b/contrib/testpngs/rgb-alpha-8-linear.png
index 68c55fa86..4051316d7 100644
Binary files a/contrib/testpngs/rgb-alpha-8-linear.png and b/contrib/testpngs/rgb-alpha-8-linear.png differ
diff --git a/contrib/testpngs/rgb-alpha-8-sRGB.png b/contrib/testpngs/rgb-alpha-8-sRGB.png
index 1fb692097..826995240 100644
Binary files a/contrib/testpngs/rgb-alpha-8-sRGB.png and b/contrib/testpngs/rgb-alpha-8-sRGB.png differ
diff --git a/contrib/testpngs/rgb-alpha-8.png b/contrib/testpngs/rgb-alpha-8.png
index dc7a01373..6507aeae6 100644
Binary files a/contrib/testpngs/rgb-alpha-8.png and b/contrib/testpngs/rgb-alpha-8.png differ