From e43c91cf1c956022fac9c830032d5b3b03f1e6a7 Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Sat, 19 Nov 2016 19:12:30 -0800
Subject: [PATCH] Working 1 bit sun_rle raster file

---
 Tests/images/sunraster.im1     | Bin 0 -> 2106 bytes
 Tests/images/sunraster.im1.png | Bin 0 -> 1774 bytes
 Tests/test_file_sun.py         |   6 ++++++
 libImaging/SunRleDecode.c      |  26 +++++++++++++++++++++-----
 4 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 Tests/images/sunraster.im1
 create mode 100644 Tests/images/sunraster.im1.png

diff --git a/Tests/images/sunraster.im1 b/Tests/images/sunraster.im1
new file mode 100644
index 0000000000000000000000000000000000000000..82c92bca923100c719a6dc039579e06953133ef5
GIT binary patch
literal 2106
zcmaKt&2ig63`SRCW_VNyJf;ktWyuBPm}`2-EKA5GEu;>Wq7rn}L1X$o>~c*iwmcp{
z1n_<MS#bH|-><(ZZO4>0e-a|4->9@z_%}{p|Nl(gb$m_zgxF1&@r1mEyoa2sOydy`
z0Y_q|E2^8OJ8CmcZ^Yzj8jZnuE>>A`_=f7Mc!1&onqu6VVqaiHRBAbO$%#`dP7`*T
zfuqbs;v0$_Z>YXtUc!CB@PJ(x3rGrTwsDD~5+u3wP^#n)J;Et9Xq}*2Sy8h<e1_m#
zv<j|J>zc=B!7;u{Dc3G~dx>tYqs?@-oH1W`)O|;HniD_J+J}YRXXB0AmAFIj$hXJw
zhVF5kBM>6-@*IL!oOr`3zU49h4ZBBRx%Aa$-zGro4mH=IdY%jwN#jn4nO=GN??4;_
zflf9~ItVr9Vq~%{nY~-Ym+qrG<O!@%VHQN?CL*7l<~yS+2IqVjG37<3W-lPA07>N;
zpxi?zD@JoJ8Jt{jnaa9Qas|q6v@h5^sK)kbVXGIRcDkOO9o0VL?N}ieCC^K@D9xcn
z36>^!QSzd+vZC%v3Ab^h-62=kUD=~iuF`tN+`vPu-ZfV5n_-zS%`T|uF|2~;r&RaU
z=S;47Peqy2XLHUhmuk1xq1M*kAA8YZ>rP~O@?~6}N!>~odtR2foxoJD(}~ymleP8~
z;x_oWXFe`i9Qt`BmiLhUAzm5$kqYu<fbWz6sT5}wM0kmnt2GChh?cz7N701s*I?4v
z{ljes-o|jcsV+1~s3omFCZmt!57)LO;S>+64dn=VNZhIxu5Wn(%TX_j9L?=R4nfxk
z9d15fnUWlcvV6*VGM}j2k#rHiA^w%|L^y+cjCZ_Upf*S%o5(jYA@2Oz%M)UdEX2;E
pFn6dv3Mta1KhZ^z!6_4ktvDqfn%L>>4el<_KH*Qk?$2G{(>vU<!-@a^

literal 0
HcmV?d00001

diff --git a/Tests/images/sunraster.im1.png b/Tests/images/sunraster.im1.png
new file mode 100644
index 0000000000000000000000000000000000000000..4390dd6c3322293bf09ab4bc8f9926144555b71b
GIT binary patch
literal 1774
zcmV<K1`+v*P)<h;3K|Lk000e1NJLTq00Mvj00EEz000007KrSK000KHNkl<Zc%1E=
zv2GkU5Qcy97Sa}iy`>5R*+)?6&i5#KlkidUC`^|!k8lU1NO>2e&;{8r#aTM;F3BCv
zOn^hcZ7c!C=YPoIaE9dA1n7QNnb&{~*nkb#fDPDy4fuZpPJ<@U1YCN}l+FTg7<GZb
z@7ln>wSkj15Ka$h0?q?|IH&<F&;utm9!$X0VW&4O7O=oSYCKrLI0UB#Gy%Bu_~tc%
z!Q$~v3uplthrhIVSI2%;97GcURoAuv@TBP4CIARl&$Uee00U@6?Q690z+MS>Rd^oo
z`J@S)IvAz(d^LFoJx>fFgb+ONIjDSBlW`uj9OpZ5>a-lk-u~EY0*wQHQ2~B88OKq{
zao*FpXD!EhR~RgGLfE@P<CQ|#yFxWj`~Ye#=Z_qFr?flYlJ-}?s{)^ag96apR<Kdo
z?xQ-z<09w9z!#PH5Scu68a7A3U^P53GFc~2jEl!T@RKTV)TpVVF~p@;h!3&CPNSxZ
zfjcO8;;f=SC@kk0@L3^h$CILxc+M0WFQ1k9smKe&#|1N!HR?#a{7q`}9B7=_=DEo@
zj#8T!M^ytb?M1+a!b=ZfJ+J@<3t=j|FxfZ=r)8lK=K->5S)Lz00hpWsxKs!OS?0Mq
z;XDBNjn7*HzW|s<Mc~dsCUI4)odDoRX{{Ik3l@^qvOab;9>5=5Ug{kCD}b<91U@<d
zKXZZWF$9hy_|BaIP969QI&~MYa}b<SrhMrHuw5}_vM55NuRl&;=bmYW!Lny1t<ZS(
ztfUp<(sTE!%oWljxXEnpPU?-D%;tcPjycWQTeCg$C^|DKz<J=!N><?$b5^nngXQf5
zSs)Cr*v(&MGK<~3!sEyaIC+HwFW}@AGEY(S3U^?oo`w5m$FezZGV>I*ppbWpT2RP4
zMJ*^ajx&e_g}gy5y&_-@Vo4zkBl9f2b2u<E&mxdxbJ1j&ddDe0?eO)EQ&xB$svW1S
z@Toq1FDqm?&c^c?5Byoh+XB8+SI-+J*GHTUg~rvErW*=z9xAu0tv5?gsNAZy6vCkH
zK!5X9)d6*v7@NRn)a7-XCI?$*^QJ=MP?sEUR)Z&06_T4KW9q5`#5NG7s_r8^#yeC6
z2!g_?s|gSUVBKP&yg&3ci-iLGii*WTF}Z4IAw9YD6*~(_VNH}JDf|TbAd-N_0lyM~
zB$II*$(~39R#a8AhqV<qe#Do$p8Ph2W^%>B5K-X+s5TRU^!GSKlW`o0HdCKZ4<Oo1
zRY=~ds6ZId@^|u!aZfCQ$O@?!bYviPd!|2<_q2;xx<aDObYQTgd8V6eJgH8jE5xOz
zOiM-Q!UKS*R|FalLQYcCTk!&H7cCWINV^HDQMhy1zHzTnc)k7FaPBJL)B#(8yQ<-3
z=YXxiU8NA09$V>g9S{cCu(`6w=L7)7)lv!k3;-8b_#2fbUnjaWinVP`JBN+xwDzj<
z1OVS8)#y@yMKN+$cXAnzV&tw?cy;c4F<IYh_5hULo7Dr&0j0u<(GB+n#frSvZ9)hh
zg*W>3lX6`x*~P+X0NnXPdm2Y!u{ve7D1JhIJ7odQDSu$jYohG)5r+rt@(DL<QcAZD
z%)Zf6b~!T@=ATkB74EVRE4Zz)+1qC>@HO}7pE-uO^qDk_tMCy>#~UsXJ`-@bCTAa3
zuod>1M3D`A$UJvpo1AOKU@Oec3LiM8%V$3DIo+kqAH%6jhD1IvGb?<P;gkD{05~Qi
zn84(8Kdb<l?zj<{yh~;{0w7$<wI#sURKO98VR{>o0F#@u1ek0pmW&~MB0h)|rd(SD
zy!30=76DVuWTG)lHIs=H;yA86Q3g!(e#wBrt~^mRhA?imoMj3VgD6voVO2T{6|Ng>
zg$mdG@<Jf|vaL~Q^7=m=kOEf?bW)RzgX*LJ`^BtCO<o0AF>skbh=I#T%;GVGpT`?H
z@MRuw<iMwS!6FCR`DuY1XxywWl>-+cTLC!E@=m!Q;?l>Cr~nK$_Cy7fjf;m-0f^W5
z7Y*PLd$tC!k3CxhI6HCC0Cuq>Y5;A#t!My^vL6C2Dh5=5uhB`J3NUs=6<~bPrvmIE
z&sG82%+Ku4XanO<2k35#`A!u^(Lo2ezeR^THF>;+n>$rF+~U`rD(r6o@lF+Xw+O2P
zw8<Yu-$@r}Zn?vqPKx%vj3|C70rww2DFH`q;O$ca4xKWv|Hwv^fZg!^lS1J$|L%2C
z8n6KyumKye0UNLZ8?XTzumKye0UNLZ8?XTzumKye0UNLZ8?XTz@IM6p3$DhbA@d(C
QfdBvi07*qoM6N<$f_Wq&0RR91

literal 0
HcmV?d00001

diff --git a/Tests/test_file_sun.py b/Tests/test_file_sun.py
index 003740c5b..55afced16 100644
--- a/Tests/test_file_sun.py
+++ b/Tests/test_file_sun.py
@@ -21,5 +21,11 @@ class TestFileSun(PillowTestCase):
                           lambda: SunImagePlugin.SunImageFile(invalid_file))
 
 
+
+    def test_im1(self):
+        im = Image.open('Tests/images/sunraster.im1')
+        target = Image.open('Tests/images/sunraster.im1.png')
+        self.assert_image_equal(im, target)
+        
 if __name__ == '__main__':
     unittest.main()
diff --git a/libImaging/SunRleDecode.c b/libImaging/SunRleDecode.c
index 9c126755f..09375cfa5 100644
--- a/libImaging/SunRleDecode.c
+++ b/libImaging/SunRleDecode.c
@@ -26,7 +26,6 @@ ImagingSunRleDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
     UINT8* ptr;
     UINT8 extra_data = 0;
     UINT8 extra_bytes = 0;
-    int ct_bytes = 0;
 
     ptr = buf;
 
@@ -47,7 +46,6 @@ ImagingSunRleDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
 
                 /* Literal 0x80 (2 bytes) */
                 n = 1;
-                ct_bytes += n;        
 
                 state->buffer[state->x] = 0x80;
 
@@ -60,7 +58,27 @@ ImagingSunRleDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
                 if (bytes < 3)
                     break;
 
-                ct_bytes += n;        
+                /* from (http://www.fileformat.info/format/sunraster/egff.htm)
+
+                   For example, a run of 100 pixels with the value of
+                   0Ah would encode as the values 80h 64h 0Ah. A
+                   single pixel value of 80h would encode as the
+                   values 80h 00h. The four unencoded bytes 12345678h
+                   would be stored in the RLE stream as 12h 34h 56h
+                   78h.  100 pixels, n=100, not 100 pixels, n=99.
+
+                   But Wait! There's More! 
+                   (http://www.fileformat.info/format/sunraster/spec/598a59c4fac64c52897585d390d86360/view.htm)
+
+                   If the first byte is 0x80, and the second byte is
+                   not zero, the record is three bytes long. The
+                   second byte is a count and the third byte is a
+                   value. Output (count+1) pixels of that value.
+
+                   2 specs, same site, but Imagemagick and GIMP seem
+                   to agree on the second one.
+                */
+                n += 1; 
 
                 if (state->x + n > state->bytes) {
                     extra_bytes = n;  /* full value */
@@ -80,7 +98,6 @@ ImagingSunRleDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
 
             /* Literal byte */ 
             n = 1; 
-            ct_bytes += n;        
 
             state->buffer[state->x] = ptr[0];
 
@@ -103,7 +120,6 @@ ImagingSunRleDecode(Imaging im, ImagingCodecState state, UINT8* buf, int bytes)
 
                 if (++state->y >= state->ysize) {
                     /* End of file (errcode = 0) */
-                    printf("%d", ct_bytes);
                     return -1;
                 }
             }