From abcbe673a9a5a33c8c768bd0b6b4136ede3b2e71 Mon Sep 17 00:00:00 2001
From: Tony S Yu <tsyu80@gmail.com>
Date: Tue, 13 Dec 2011 10:17:12 -0500
Subject: [PATCH] Add test for reading uint16 image

---
 skimage/data/chessboard_GRAY_U16.tif | Bin 0 -> 80110 bytes
 skimage/io/tests/test_pil.py         |   8 ++++++++
 2 files changed, 8 insertions(+)
 create mode 100644 skimage/data/chessboard_GRAY_U16.tif

diff --git a/skimage/data/chessboard_GRAY_U16.tif b/skimage/data/chessboard_GRAY_U16.tif
new file mode 100644
index 0000000000000000000000000000000000000000..13f78ee5b07a33ba29784500e89f07ea5cb60ff2
GIT binary patch
literal 80110
zcmeI4L2e{P5Jk%jLM&kecR;h66<3%YC*cg-Xs*G=t2vPA8k~~9<^Gwum?um1Yz@`X
zkyc3W)vva!5T8H)ar}H7=f8&!$HVQ_zqfx6FJAxf{Q8&M`yZZPpXYvh@%q<?AHV(V
z-?#UFd-1csKfnLapXW~;$J6Hb<MHX+&#nLG)A8txWnB7LMMd0K=3~{yaeFR&|D5YX
zAM+>Vbw8ubhxsrc?H-uZ$rIOomiT$z?xXAxtcV$Yex%n{>7&uf9>I#3VLsAptMt+6
zWRGA)%rGD6wN?6Pbh1aVB4(J6^x7(YG&<QMSP?VKM|y3QJ{q0u5v+(A<|DnfN*|3*
z_6SzQ4D*p*TcwXiCwl}dVutxhudQNyJl?h@*1x|VUyi?ykGEZm)$fnD^Iwjy&R8b4
zO7=V_-E~^~tj=8Qei5m??u@5h9k+~p|E;j=&d^70YqW~k<j_YmkUf1Qk5&<^h#BUi
zS<aq5l1HluR>TbR(JW_AAIYOt1S?{O`Dm82r;p^(DuNX;!+bQ$+0#ezXcfVVm|;Ge
z<?QJrd9;dPMa(cC&2skikvv*Oup(xdk7hZ0`bZwFB3KbK%ty1FJ$)pPRuQa-8Rnx|
z&YnJ!N2>@{#EhrSEv@~XA~)#Pw+;7CN_U;vKC5%rt~~|b>Jh2E?hN;-*B1hbEj@kc
z<E^J)zUT8Qd9>=ftbAU*uV;xq^wFMF|Mz@e%^8go`>g!^>V0KUANm++zJJ}%Iq_Lb
z%rGD3<9;qi$9xPD^Xqk4`Mi2x&k}v;!{^ogd%%3$XY;y4up(yo`|fMA_iKIJXY;y4
zup(xdkJo1J*ZR26=5>c)Ma(cCug%`C86WHWMCZx<ogz2r*8dM?`zNKl&TOC6dB^X5
z5vjfI4ENjTe~}m`h`*%jW6+*o^)Y8OP7th!8RlaconQ4aXEaU_tcV%rV;G%Z^)Y8O
zP7th!8RlaconQ4aXEaU_tcV%rV;G%Z^)Y8OP7th!8RlaconQ4aXEaU_tcV%rV;G%Z
z^)Y8OP7th!8RlaconQ4aXEaU_tcV%rV;G%Z^)Y8OP7th!8RlaconQ4aXEaU_tcV%r
zV;G%Z86WHWMCZx<ogz2r_BIapPD^*4*FLNBj-Tf=PY|iS?hN;-*Y`7ttx0|8BcFe7
zRX(rYqVo28*Jb7N>U}*+^r4TppHVO0^?CJ@Mt{A}%HOZvR|fT=kDl?fyPtF7vzC})
zKFo*tX!pRJPM)~#v&83ByN|L*up(yo`H@~*rH@7@dju<DhWSXZt<p!MlRbhJF~fYM
z*H-DH(a9dcikM+O(rc^q(dcB4U`5P0ZhyPm`QG0ta)WMf<8be^bk}+9vpSQp`$eSo
zx-;CT&cBwniug;aKAM5-=_7fxieN>|Fdxlw_VkfFT1BuTW|)s=IeYp@9<3r+5i`t3
zvz$GBB#%}RtcV%rqgl?LK9WbP2v)=l^U*A4PanynRRk+yhWTigv!{>b(JF!!F~fW`
z%h}UM@@N&oikM+On&s^2BYCunU`5O@AI)<1^pQMTMX(}fn2%;TdyJ3ueWLT^{!Wn_
zbUXWoyJw}lPHdmmdB<la=M|CK>&|e$eSJTZ*qYRbK71y&dtgo{Ph9ue?(?eMN7*A-
z5i|V!NUyEZN28NHf)z2te5BV_>7&uf9>I#3VLsAptMt+6WRGA)%rGD6wN?6Pbh1aV
zB4(J6^x7(YG&<QMSP?VKM|y3QJ{q0u5v+(A<|DnfN*|3*_6SzQ4D*p*TcwXiCwl}d
zVutxhudQNytnU+@C---X+@RarINUoe-F063tj;@r_lrpFb!WIwo!c|5A~tLE(F|ly
zAIYOt1S?{O`Dm82r;p^(DuNX;!+bQ$+0#ezXcfVVm|;Ge<?QJrd9;dPMa(cC&2ski
zkvv*Oup(xdk7hZ0`bZwFB3KbK%ty1FJ$)pPRuQa-8Rnx|&YnJ!N2>@{#0>M%EN4$2
n$)i;SD`JNEXqL05kL1xRf)z2td^F41(?{}X6~T&_@pSwLHyqnF

literal 0
HcmV?d00001

diff --git a/skimage/io/tests/test_pil.py b/skimage/io/tests/test_pil.py
index 058e1dc9..b01bd42f 100644
--- a/skimage/io/tests/test_pil.py
+++ b/skimage/io/tests/test_pil.py
@@ -51,6 +51,14 @@ def test_bilevel():
     img = imread(os.path.join(data_dir, 'checker_bilevel.png'))
     assert_array_equal(img, expected)
 
+@skipif(not PIL_available)
+def test_imread_uint16():
+    expected = np.load(os.path.join(data_dir, 'chessboard_GRAY_U8.npy'))
+    img = imread(os.path.join(data_dir, 'chessboard_GRAY_U16.tif'))
+    assert img.dtype == np.uint16
+    assert_array_almost_equal(img, expected)
+
+
 class TestSave:
     def roundtrip(self, dtype, x, scaling=1):
         f = NamedTemporaryFile(suffix='.png')