From 211b31e1545439d39813063b4a154a9801c1d618 Mon Sep 17 00:00:00 2001
From: Harald Kuhr <harald.kuhr@gmail.com>
Date: Fri, 21 Aug 2015 10:38:38 +0200
Subject: [PATCH] TMI #163 Support for TIFF containing signed integral other
 than 16 bit.

---
 .../imageio/plugins/tiff/TIFFImageReader.java   |  12 +++++++++---
 .../plugins/tiff/TIFFImageReaderTest.java       |   1 +
 .../resources/tiff/signed-integral-8bit.tif     | Bin 0 -> 75972 bytes
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 imageio/imageio-tiff/src/test/resources/tiff/signed-integral-8bit.tif

diff --git a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java
index 9bc4cc25..d9968124 100755
--- a/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java
+++ b/imageio/imageio-tiff/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java
@@ -521,10 +521,16 @@ public class TIFFImageReader extends ImageReaderBase {
             case TIFFBaseline.SAMPLEFORMAT_UINT:
                 return bitsPerSample <= 8 ? DataBuffer.TYPE_BYTE : bitsPerSample <= 16 ? DataBuffer.TYPE_USHORT : DataBuffer.TYPE_INT;
             case TIFFExtension.SAMPLEFORMAT_INT:
-                if (bitsPerSample == 16) {
-                    return DataBuffer.TYPE_SHORT;
+                switch (bitsPerSample) {
+                    case 8:
+                        return DataBuffer.TYPE_BYTE;
+                    case 16:
+                        return DataBuffer.TYPE_SHORT;
+                    case 32:
+                        return DataBuffer.TYPE_INT;
                 }
-                throw new IIOException("Unsupported BitsPerSample for SampleFormat 2/Signed Integer (expected 16): " + bitsPerSample);
+
+                throw new IIOException("Unsupported BitsPerSample for SampleFormat 2/Signed Integer (expected 8/16/32): " + bitsPerSample);
             case TIFFExtension.SAMPLEFORMAT_FP:
                 throw new IIOException("Unsupported TIFF SampleFormat: 3 (Floating point)");
             case TIFFExtension.SAMPLEFORMAT_UNDEFINED:
diff --git a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java
index 6808363b..4e64699e 100644
--- a/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java
+++ b/imageio/imageio-tiff/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReaderTest.java
@@ -82,6 +82,7 @@ public class TIFFImageReaderTest extends ImageReaderAbstractTest<TIFFImageReader
                 new TestData(getClassLoaderResource("/tiff/cmyk_jpeg_no_profile.tif"), new Dimension(150, 63)), // CMYK, JPEG compressed, no ICC profile
                 new TestData(getClassLoaderResource("/tiff/cmyk_jpeg.tif"), new Dimension(100, 100)), // CMYK, JPEG compressed, with ICC profile
                 new TestData(getClassLoaderResource("/tiff/grayscale-alpha.tiff"), new Dimension(248, 351)), // Gray + unassociated alpha
+                new TestData(getClassLoaderResource("/tiff/signed-integral-8bit.tif"), new Dimension(439, 167)), // 8 bit gray, *signed* integral
                 // CCITT
                 new TestData(getClassLoaderResource("/tiff/ccitt/group3_1d.tif"), new Dimension(6, 4)), // B/W, CCITT T4 1D
                 new TestData(getClassLoaderResource("/tiff/ccitt/group3_1d_fill.tif"), new Dimension(6, 4)), // B/W, CCITT T4 1D
diff --git a/imageio/imageio-tiff/src/test/resources/tiff/signed-integral-8bit.tif b/imageio/imageio-tiff/src/test/resources/tiff/signed-integral-8bit.tif
new file mode 100644
index 0000000000000000000000000000000000000000..fa80da15b012e4143fe64dbd2f364a6eab40e6af
GIT binary patch
literal 75972
zcmeI03y>T|8OQ&VKtd9@yhs88lF9N)NcJANkjHU%U>=8oydW1y!gF#r$&I<)J$LuG
z1W`l;EiKE^LJ$!|5F==5S(c(8B8VU&NNHJ?mV$^Nf`}lcWm!7*bWiv6?9T0y?Cm6T
z`Tmt`fBn7s>tF9(LDsLw832yL6azSdS!^-xHw<ZGpD_kwx&J5@8SC3#);P^>z!+BE
z0ppa97*l!eK34OLF+<Clsd^g5ESWR*J;rPtDb5`?&NxBY4aSLD?R?*6lNc@DS(pNh
zn`vzJ{ho(w+-bo0-vbkF0w$dg9K#|F-(%?mz_inW>CXW(J_F2J2OQ73&3*tl@x8#D
z`M})gfq6FrC$9%iWh_p65SX6_&R75}`~#4_1!&p;w6J*>e;-&<0G2X(%U%Fhd=@xs
zBhWDp=zIt`rwFWE2(0=eu;y0a+)cpR@xXaM0M-ox8x{c@Uj#1r9I*KUU<;#r(Zj&j
ztAOok;F3Q9m)!<jaUoz$0CxNk=p6!fHUhg|0-VnSyEg-wi9q%dU|<iBZvqN01B15%
zL*2mMNx;>Q0@v&XKF|zY`)A;~JAmuA05=>B-1sBlqgMkTYXLs~3h;?90H3@F_|!4L
zrym1udLMA}V&Im)0Jq)=+;%Z=djoLCkAXX{0q$xA?tT@x=ZnC;t-!sLf%_f@zV?3L
z>q~%dyas&pF5p|+fN!(+`py%;cRv6;a3=8JUxA121|HrHJTet{^e4b$*8-0(1)g{v
zc=AiYQ<nfwPh(%BCxK@_2>fCh@XNmezq$wb^`*dXrUSqIDe$}NfajJ2&%Xh@@MYk|
z%Yc`T1zvs%c;!RDt1E!l{tmpp4|wBp;LRDpTR#Kdz8?5z8}P3;fq#Dm_|Fx<e`f;!
zdz$?ed>F=<v)C8@Ef`1M3uFA1Fec1`G4UA~N8bRWp&iELf54b}AB^c1j2XwlnE7)U
z$K42HHv2g^;cXZveHF&s9Wdq{4<q#~`{v$He~H1N`5ge$SoS+WtQ*&_F;_adbXP8)
zv5M^194Uze3{nyaj3E&LA`laSu_Piu1Y#m^1SyFGjvOhuu3JN^+N!G`T<`wXCx|Cw
zzwf!<1)+P?Rvl^;xv6*m$V2Ps95;;EJ%@=5<KFLrP@meWL#-k=_3j^e=s|Gq_dWN!
zAatqPsza?JH}&oxd1xJ-<3~yiObxAStFC@<z57?6;1JEI4NPs-)sfV@fAtAQHsh#~
z5(861tJ<ooA6)PL)h8I)j0qzp2BwBqwN+O?xZeG%Pf)iEcD3Mk$`Xbb2|tVPQEp{;
z^ZCKbqw*xbsi-b1(^Ev-vgX57mW&{>D$kRo=tL<&h<yr2*pNY)JW)Bqd8$^#ReFRW
zJBagm8|jkSaxZ7{PMsJWtqv>m1rGl<qEhx9MXQI1U&p_w-1?Nfka7tszDqI<qQ1oz
z35_=nf2gQ`s<-E+zi8)$JW*L?J~=82lwK!1MPhf8e6b5kldo#;UEL3r8<Q#pReGqg
z*aUUKzU&lPry6-xWm(Za)waZtJx9r^c=-2G`+$n~Mr9DneaaK$moo~IR7byeM3qWr
zMp@P{zLIMMh2^s((Q~vf@AlI6R<%_|;L}{?d0J32_11cK>DN*<(~l~TGJ;ux0Rmq{
zn&y&6CVD+aie1c=He1zB8G%o8mFH<e&D1)3W?4jYXr^DKJj&2IMEEMZN=8ZgmR(kR
zIAtp%K&82Y2ary-YVx3HThH`eVO+kyEGBD3c2rh`PZo)lmugwzgA=-I2qbRl@7YFJ
z%4leird+)QWlMvtn*0>a!`rgG=q^7sM__7IA}<J)pUX02SgX@q@~F|b^81z$k{1tS
zQFm8iX~<P&L>XmCnnRh)5U;CyWVcE_6_d%qiw2%#Ta&|LH+H#4u9KB9S(%zk`IMmt
z!@ad#S(4_ECR@cQs&!xlvqbq+VQ^xED+rDPOWsee)v%Q3DNh9&WjUHdnsTlDL{anU
zK7WXyS%s+*6q-^Zc0cZs>l9^73CxN<Em+c9+m<G2duht`ot_(==bsrg(}qZ}In|dd
zS65i<p2DMysZ*7y49``X7r12ah_y6HwFyoMT*^{LkQEFS_R0H{Tq|OfM7w+<3QW17
zVUes@QbeBa8<vSmD*2XZr}(YC%+jw$d6svO$_ss)_y|F0*ohJqm?q`H;SvsJmKf8f
zDW7Kv1wOWyt%7jiQZZ@B4kAUXR;JA02lF%)(q@VBu`^_`Kb4jx2N*3Yzp1>8x~DQU
zR1%9=MTwRt!xbLQtI^NXs>7yyF1d=sv{}OGGA!H65wt8VCAsGG8pU|j*n!Fq0s(rp
zg8+T{^kZui`(dlC0aYImff)xP*Y&H|s~t!^)f^N8?6ss0%K3EY%mb7EY6n(KRYc(M
zBruCa1c*RP1dbymk-+gJB0vOUA~2go1c*RP1Wq6&k-&+h(MG`K7vlepC9dX~l`g4*
zej+ceQd6lP#fBqr((rO!FUCK_r?!u(V(;U-OA@6!s)&3eOu+SDjJNg33;LDbz>k%r
zlx#<M%)_(YoZ;lonZy1_d8WUWUa`s@PmFM>GTDjNx)N~bxavuSRq`l&t5UpK{DP2A
zK6YJaJ^Y%_9Y*flx$F-U|IZ3xi7mIeDO04!<%X-3lxE0GT5BX=M$2Vx@2`+=c`q39
z1{pk0Y*`MI_|&pRC;F@>0YN@EL3^KQlc$Q1pAgyvoyZyy0`nrpe>1WV8C1r+z?!GU
zMV^TH8GO;QWh+|iOF%;&X)>qg_hu1W?Xx6a-+2$K?x|trdJ*yAeR9kH3?iN-B{EVj
z&*mH7BNJ$ifq-D{{kjx~c~<Zael(aP2&=pxJ4hpIL<pQrN+N+%NJM}L#6;j!5)mK*
zF%dY8L<ERHOax9RC6T~<5)mK*F%eim8jS>8|5EM(VX;sCuaEwY+0wzy(TLzsywe%g
z<njdXQ~vcF-0N}=H-&?z(#N4dKs=B)3A4l#2|L*MdoPC+4}pbM<t|*v{xG@z%1!Cy
zk&=z?qosZX7FCz)`Z<B&Ii!~dLmNMxmV-(_J&82LDtGj32jO+n)#SQq*U$0S@FHR|
zrCK+N$3uX>N9dvC3(3`+L$~9Z>o7m1v9eqq);}A?hWWV>3RUh!(YOf6C(>Vt|KBzr
zz_Y|8GB2*V4*PSONJ%8nOd<kAASMDWBqBfrVj{4ZltcopBqBfrVj{4FL<ERHOa#s(
z5dk6)6M?0qBobIgA_7DpCIZVzM1TmyL|_Gp2oQmo2(*!sNZ>3I5g-CF5ojk70U{6+
zfesQ8AObNF=p-ePz}X}sKm=kUa1MzG5P_Hoyo*Exh(JsPR+5rPU=@i75P_HotR@iw
zA`laSH6$WH1Y#o4MM@%pb4f&i2*gC--6SGF1Y#nvmXt&S=aGm25r~Pv`6MDh1Y#nv
zjzk2AKuiSIlafea1BnO_ftUzvBoP535EFq-BqBfrVj^$>DTxFwBoP535EFsTBqBfr
zVj|E@A_7DpCIVYXNhEL)i3kvZm<U`<A_7DpCIVYYM1TmyL|_{!i3GNjhyW3YiNGZ!
zB0vOUB5)~*2oQmo2wX-=B7w_EM1TmyMBoY%5g-CF5xA0+L;~$+@5%I=SK0Z3lgoCb
zS{j>Erk(A{^*Y&I9jPtdUFqd1vrx3My;grNYj>owxzyR6?eo%U^I|KXWm#=zvCk=(
zJ-JNA&K6B(T3K`B`ZejT>(`kXyJ+=VMa$gLpX=GZ$Q<f(diq#ywrDw7R+Jy?ajbr`
z*I~8Z1k4_=@)j#&6R}3UX0F(0=S?Rwkjt|vimGFyxvAf_3btwYIz_X`8Z0`w!9xFD
zbH20Fw2G$H-@jlH@36z_*=-IEurX~jmv?qK-YH@zduJ|ho4q-94YQDIG`n(nGvm3O
zEQ@3;)-$`vEZ8<L_Ab@EwyVn=vUivTr)amCeZ}HHTT@dmW2YI%#$0|^(~z^<Y1){v
zyPcgo8_jgOvz^tMESfEJr2PD$p`pgyfSt`aJ^5UrCpWN{mu~Lqvoltqi4`<0Zf-d<
z-Q1EAm2G<pPN;gQl~*ioZf<E}phabxF=dc??3B4>%i7f)slj}<ZE(=(ZELmcR;$&r
z(yexDPkPDH9y@I<S-v>ExYur7vCQsWwqnULc2vP>EAScC<$Cz#LubCTi6xVFen$^q
z<DNoqs<VA<#@c0@-ss$FW8cON?Ay?hDzGQ&x6?g+RyJ$*v&>D-9=pF_u5@;-$@V%H
z`|cL=gY4p~<yUEAzSquoq_%F`zN$OLTZ$5|=Vs?>dlmb(3#(gMTRT!qT2~0~Hs)Q*
zpm@34c}Dl%0XB(~EiPy0uM(5+#=hOw%zImzfquKN$<Fihyvok@b<VE7;wG!u*VNhG
z<fnJGdtZ^&-cLuDlP?t6Kx{N_vWcY0j%McCE{24yoBFM+y(%}DEsDP0GqaL@JBm`H
i$F=C}Om*(p_n^JW>&oVo<1tg9V+MZ~wz98iC;kr*d~T!w

literal 0
HcmV?d00001