From f940fed152b769a140eae8e78130965f0fdd5a75 Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Wed, 4 Apr 2012 16:02:17 +0200
Subject: [PATCH] Added test case for 1-bit/monochrome.

---
 .../imageio/plugins/iff/IFFImageReader.java      |   2 +-
 .../imageio/plugins/iff/IFFImageReaderTest.java  |   2 ++
 .../imageio-iff/src/test/resources/iff/owl.iff   | Bin 0 -> 3554 bytes
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 imageio/imageio-iff/src/test/resources/iff/owl.iff

diff --git a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReader.java b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReader.java
index 3a15cd67..53f2fc8c 100755
--- a/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReader.java
+++ b/imageio/imageio-iff/src/main/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReader.java
@@ -325,7 +325,7 @@ public class IFFImageReader extends ImageReaderBase {
         List<ImageTypeSpecifier> types = Arrays.asList(
                 getRawImageType(pIndex),
                 ImageTypeSpecifier.createFromBufferedImageType(header.bitplanes == 32 ? BufferedImage.TYPE_4BYTE_ABGR : BufferedImage.TYPE_3BYTE_BGR)
-// TODO:               ImageTypeSpecifier.createFromBufferedImageType(header.bitplanes == 32 ? BufferedImage.TYPE_INT_ARGB : BufferedImage.TYPE_INT_RGB),
+                // TODO: ImageTypeSpecifier.createFromBufferedImageType(header.bitplanes == 32 ? BufferedImage.TYPE_INT_ARGB : BufferedImage.TYPE_INT_RGB),
                 // TODO: Allow 32 bit always. Allow RGB and discard alpha, if present?
         );
         return types.iterator();
diff --git a/imageio/imageio-iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTest.java b/imageio/imageio-iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTest.java
index 1f611f14..11d88b74 100755
--- a/imageio/imageio-iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTest.java
+++ b/imageio/imageio-iff/src/test/java/com/twelvemonkeys/imageio/plugins/iff/IFFImageReaderTest.java
@@ -63,6 +63,8 @@ public class IFFImageReaderTest extends ImageReaderAbstractTestCase<IFFImageRead
                 new TestData(getClassLoaderResource("/iff/A4000T_HAM6.IFF"), new Dimension(320, 512)),
                 // HAM8 - Ok
                 new TestData(getClassLoaderResource("/iff/A4000T_HAM8.IFF"), new Dimension(628, 512)),
+                // 2 color indexed - Ok
+                new TestData(getClassLoaderResource("/iff/owl.iff"), new Dimension(160, 174)),
                 // 8 color indexed - Ok
                 new TestData(getClassLoaderResource("/iff/AmigaAmiga.iff"), new Dimension(200, 150)),
                 // 16 color indexed - Ok
diff --git a/imageio/imageio-iff/src/test/resources/iff/owl.iff b/imageio/imageio-iff/src/test/resources/iff/owl.iff
new file mode 100644
index 0000000000000000000000000000000000000000..65b12e02cc54e43c533c387e4e32698513bf032d
GIT binary patch
literal 3554
zcmb`{drVVT90%}IEKpr16>vacE6g_<H5!G@&D#P48CJl#Ma_hnnYcuw3sb@AxJ9OP
z?g86;U^Esbv2)2N(`0BE_R1cTjnFQ>h;z2+wmMN;9;Kzd_nZ~!^Zfd!C%N>T&;9=H
zA?KWX^NUxj5PJ4j;mRCUj%r07LMRb6p%(8i5{>;qlO~Ogb5+U`?;yr|5khj6sse9M
z?7dJ<ao#%b6B@nz^qMQeqlQ_CmI!8NVD17m+zd@fmxEf@Of4|?k~m<z44NRV2f3CL
zF!yV89mwhS#{#=6nFj1~H_Y{kCxG1Wzh48(K9&KjQC$OUkw{6KFqk0&_M)%}*utXe
zv=ODI30UF5k69Xzi+-kUbV}D&+W7c`eZUqd4g%YEbR})h#WQ<pbIgtXkG6sNQ;KMF
zo)d~`bL4b%0{boPbznUSEwnlLV=D;NhNbNyipcQf9bk`!53FgXbN5<owY1qk`~sX8
zr>6;=Kga1RBVBv{_w{nxtO;9zJz#DybdD<;rHP;pu)WxA(Xdoduow|V#AB2xXmgoI
zPtiuUC*{&++qn(Af>Za_Fd#P|WhoQ7D!{*D>#%?w>SP=RbZPaS203MJo=s*cBL<9U
zoBM|cZ1^1QH62xY-|V*0FMhkhLw_K!`SDF1wE|AFzL%rSjkjy!<zaJR;^rT23OCPp
z7q2bqX2NnkZTzxY>YZfCsUiNIuo%H)U`OV%Fta*@U$_I|t7otge8=)-ST2hg_H^tP
zv!Q6%vf<&YoeFJ;**(M~w2vqjgcvar@=6vlg`Nx}Dc5HXelLy=$zgm;Ul8B=nL5NC
zY0Veny6211*#HW*JGxT)#kUX_oMc45#pO8kRr?W1TOfDu$06gNKP0PWpsav-wmf2U
z6pE-ul<GHub-LH9XP1^HmIPPks?aucYEV;yg1I5*Sx@3-&U7eB@r=J#XDGW}p?*8h
zqIDJf4I4VPE-I{g4{=pReoNcD!DUiTKb@q`p5-%a-BZcQBqwLc_ooC7k&RsEl{K=;
zS+X?$90T6G&7K%vA(kckb56ovB0cDv<!>gx;D4UYbF=j5a+FbG=8|K5bMz8Unqr8~
zF6V+qu3Wwy!;2P9Xm%mFFIVPPtYCJU@>A{4DVcG@BP&HHo|I@}?#`QH7&qa9WN974
zb89o5>a#xcWbeyItZ{X<h!@rS%yF^bq$Ze4vV1hH&S%zsee0^qz3PIEgy<OZq&+Zy
z`%e+R($HjK$zyihuFLF)H;-VXw3n0KaUzCuj_P*8t9Li96KZ|d-t1&NBz<kGy!K?h
z&yt)A49&YlQR%Ub{x1YBds%Pl=fyG$V~_L2@TF}1tv=0!RUGRRLWFI{9v9@#k*YKS
zB7DzZv-L5B^D5>9O}KRO{WIsJqS1RHmKnFC_Q=FNf6D{rk-H~nB^)<NL`=Y}ownSm
zxd}%?PrQ}WMzy`v=HIU;SplaiQZp9o0)^g=^StuBs^)l7sNoSFNl{9e@ll8qN4@4h
zJ5S=c62%S-D&7sPB@$FmcoaPEV>kO^8A5PaEoqp{dhh(?y#lRu>DsZrEdbu4YR(Zd
z9Pb(it^#YAbe=XWnpi*^*<a${)8MVHXnAlj-gBcjfH_ahV(8q^;5M3w`;4BY5vO(0
zMDU@7(2~Qyjbj0x*$8qj%LmYIKpU>Jg4{z1T$cVdS3vI3u3BLCt3CyGw-Xw^{Rzn7
ql+U5nN60-N4|3%CVQB6;XuT24ZG^d-<<N`~jA&slqD6>3W%?h2-`lAG

literal 0
HcmV?d00001