From ef1298bf448f6dac3b648841dad778070ce7ed04 Mon Sep 17 00:00:00 2001
From: Manuel Gunther <siebenkopf@googlemail.com>
Date: Wed, 27 Jul 2016 12:06:32 -0600
Subject: [PATCH] Added test cases for different variants of PNG compression
---
bob/io/image/data/img_gray_alpha.png | Bin 0 -> 644 bytes
bob/io/image/data/img_indexed_color_alpha.png | Bin 0 -> 574 bytes
bob/io/image/data/img_trns.png | Bin 0 -> 360 bytes
bob/io/image/test.py | 28 ++++++++++++++++--
4 files changed, 25 insertions(+), 3 deletions(-)
create mode 100644 bob/io/image/data/img_gray_alpha.png
create mode 100644 bob/io/image/data/img_indexed_color_alpha.png
create mode 100644 bob/io/image/data/img_trns.png
diff --git a/bob/io/image/data/img_gray_alpha.png b/bob/io/image/data/img_gray_alpha.png
new file mode 100644
index 0000000000000000000000000000000000000000..7643ce025d21ec8385a93836180167d3ce62167e
GIT binary patch
literal 644
zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU=ZVAVPIh34hTEXz`($g?&#~tz_78O`%fY(
z0|NtNage(c!@6@aFF~r4J%W507^>757#dm_7=AG@Ff_biU???UV0e|lz+g3lfkC`r
z&aOZk1_lPEByV>YhX3vTXZABNFmM)lL>4nJa0`PlBg3pY5)2HCwVp1HAr_~nhS+*D
zI||h9><H^>?Twfrahc`XhKm1(oYv^9`ODuF{wzL1(@ZRo<uBtm_U?5{0+N+FH53me
z9?<7VFU%>+E1!J%WnS5{z2^Df)x?h%w8-Dsx#8KWGcy@hO*Li^FydBYT`;SD-|}=J
z4z2??A3R=|+0?`EN8uq$!|BhxzGv5eHsRYA%ush=<^(UZ^jVS5GdWh4RCrnCUR-l{
z;o1kg9NE9c^l`6z@Tv0lsjSwjXNgHJf0yj7o1#`xEjx3^zV-aK%%iO{&2-~W+}wHf
z=@I^@$w2`T#-b}KTc6~7kmGIm_3)_VS`W<&Yr2{@*KIM#|8;@KdtWdkYhd`TmkbA9
zZnUe;oLXZ$hxtI=zPHblLhE(KR+=a0Hy#q1_D0cN?#RZ!d@sCZ#65i@K5ydMEb{Ep
zjk@msq}KneDr+XrfB9eP#QBu<o$LLl=guiScJs3C+X6k2b5h@@ZkiCen}K1OPhj1J
z*G-|P7%sd%#2`@g$m{aP>ZG)HQQ_6=PQ{B}U)aA!W{EQc1A}UbYeY#(Vo9o1a#3nx
zNh*VpfuWhMfw``cS%{&5m8pr9p`osUnU#UTPIuiV6b-rgDVb@NxHX)Rnrg?uz`)??
L>gTe~DWM4ffBO3!
literal 0
HcmV?d00001
diff --git a/bob/io/image/data/img_indexed_color_alpha.png b/bob/io/image/data/img_indexed_color_alpha.png
new file mode 100644
index 0000000000000000000000000000000000000000..defabb829d44bcd28b8939afbc64c1b3f9143342
GIT binary patch
literal 574
zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU=ZVAW?*2L)}B|!z`($g?&#~tz_78O`%fY(
z0|NtNage(c!@6@aFF~r4J%W507^>757#dm_7=AG@Ff_biU???UV0e|lz+g3lfkC`r
z&aOZk1_p+}0G|-o(xV@~AKh|h^{kHv)^{%3Sa$f$jrFs;HXmEsTQ+6wwpmlVA8uWA
zZSAag``0e)tL|R1`pw?evwLf%PVH%3vF*wBr4{=gO`SRA&Zha>=Jnp+vhe@^{}&YI
zcQG(9NR<Tn1($w5^Rct+M%U6QvmRc1x3K%o?5V9!DyH7qcE7Im+Y*r5lf2zsq)OAD
z7%?y~a29w(7Bet#3xhBt!>l<H3=9lgJzX3_G|txsy_9M;;83=nV|~~5`EUCdS}Pmg
zZu|3aG7E>8q)bxB$rDT~Odfqn3Yl>9l8V%^poF7r1wKrTX6dFe3w@6)+gz7h!Yr%&
zh3_+a{=zu#gKDj2pQA+uc4yiLRm&VYc2oM|g?E8|b43z3&pmq<#JPzj{O`WX=<tjk
z=c}g~+vIjnvr9kMzMtuzM(~#V6?WJBZxjpj&!5U;S1I@~;e%5t@5d*<3fJC?+qCN>
z%j(+pC+t@70&AQXIyW;gFsPQeMwFx^mZVxG7o{eaq%s&87@FxCnClvug%}!GnVMJ`
q8tNLDSs57Ybk}V{(U6;;l9^VCTf+&dsdfwu3=E#GelF{r5}E+@1mwX0
literal 0
HcmV?d00001
diff --git a/bob/io/image/data/img_trns.png b/bob/io/image/data/img_trns.png
new file mode 100644
index 0000000000000000000000000000000000000000..7c16aab16960149a4762610eb8c6827c0814600d
GIT binary patch
literal 360
zcmeAS@N?(olHy`uVBq!ia0y~yU{GLSU=ZVAW?*2L)}B|!z`($g?&#~tz_78O`%fY(
z0|NtNage(c!@6@aFBupZ0t0+PTuYCB_;_IbolWyA_C30>e)iJdvZ*ttd_TJ7|NsBn
z=Jnp+vhd0FrSJByy|#ANtf}1#`>JR6)=XKut#!q=?j@@qZe8?d@9L>jd%89sD?9w=
z%<5U4%QhNpD|KaHVA$&E;uxZFzBcHkRI>p`@@&0br|(|>ZT~`RWy9NTe;!U|;ShT%
zlhkqY1k(zWM_;l-CLBGaB6Te2!CAHfAErjLbkmrHzDJgA{+C(8EUWy5?=yS;!Z`1P
z%B^Of)kOu`Gwp-I-yA-6Q~KhCcYbZ%A_<&%&z?naZel6_YgZi|o^j(`^)zFf-0o?1
z>F0LuXZoiRyybp{-8KIk#lqV2r}C_;6nvPl!KIY<<C9;7YwyKv+I5m;_1%^y>^`@-
Wyc%--r5G3(7(8A5T-G@yGywpGTc+>;
literal 0
HcmV?d00001
diff --git a/bob/io/image/test.py b/bob/io/image/test.py
index 48fa152..16cc98e 100644
--- a/bob/io/image/test.py
+++ b/bob/io/image/test.py
@@ -14,26 +14,48 @@ from bob.io.base import load, write, test_utils
# These are some global parameters for the test.
PNG_INDEXED_COLOR = test_utils.datafile('img_indexed_color.png', __name__)
+PNG_INDEXED_COLOR_ALPHA = test_utils.datafile('img_indexed_color_alpha.png', __name__)
PNG_RGBA_COLOR = test_utils.datafile('img_rgba_color.png', __name__)
+PNG_GRAY_ALPHA = test_utils.datafile('img_gray_alpha.png', __name__)
+PNG_tRNS = test_utils.datafile('img_trns.png', __name__)
def test_png_indexed_color():
-
# Read an indexed color PNG image, and compared with hardcoded values
img = load(PNG_INDEXED_COLOR)
assert img.shape == (3, 22, 32)
assert img[0, 0, 0] == 255
assert img[0, 17, 17] == 117
-
def test_png_rgba_color():
-
# Read an indexed color PNG image, and compared with hardcoded values
img = load(PNG_RGBA_COLOR)
assert img.shape == (3, 22, 32)
assert img[0, 0, 0] == 255
assert img[0, 17, 17] == 117
+def test_png_indexed_color_alpha():
+ # Read an indexed color+alpha PNG image, and compared with hardcoded values
+ img = load(PNG_INDEXED_COLOR_ALPHA)
+ assert img.shape == (3,22,32)
+ assert img[0,0,0] == 255
+ assert img[0,17,17] == 117
+
+def test_png_indexed_trns():
+ # Read an tRNS PNG image (without alpha), and compared with hardcoded values
+ img = load(PNG_tRNS)
+ assert img.shape == (3,22,32)
+ assert img[0,0,0] == 255
+ assert img[0,17,17] == 117
+
+def test_png_gray_alpha():
+ # Read a gray+alpha PNG image, and compared with hardcoded values
+ img = load(PNG_GRAY_ALPHA)
+ assert img.shape == (22,32)
+ assert img[0,0] == 255
+ assert img[17,17] == 51
+
+
def transcode(filename):
--
GitLab