From 0c70f74abe8b1c0a37bd5cf01db91b35642167ef Mon Sep 17 00:00:00 2001 From: Philip Searle Date: Sat, 13 Nov 2010 19:29:26 +0000 Subject: [PATCH] Correct greyscale PNG scaling factor. Non-interlaced greyscale PNG tests now pass. --- basis/images/png/png-tests.factor | 5 +++++ basis/images/png/png.factor | 2 +- extra/images/testing/png/basn0g01.fig | Bin 0 -> 1081 bytes extra/images/testing/png/basn0g01.png | Bin 0 -> 164 bytes extra/images/testing/png/basn0g02.fig | Bin 0 -> 1081 bytes extra/images/testing/png/basn0g02.png | Bin 0 -> 104 bytes extra/images/testing/png/basn0g04.fig | Bin 0 -> 1081 bytes extra/images/testing/png/basn0g04.png | Bin 0 -> 145 bytes extra/images/testing/png/basn0g08.fig | Bin 0 -> 1081 bytes extra/images/testing/png/basn0g08.png | Bin 0 -> 138 bytes extra/images/testing/png/basn0g16.fig | Bin 0 -> 2106 bytes extra/images/testing/png/basn0g16.png | Bin 0 -> 167 bytes 12 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 extra/images/testing/png/basn0g01.fig create mode 100644 extra/images/testing/png/basn0g01.png create mode 100644 extra/images/testing/png/basn0g02.fig create mode 100644 extra/images/testing/png/basn0g02.png create mode 100644 extra/images/testing/png/basn0g04.fig create mode 100644 extra/images/testing/png/basn0g04.png create mode 100644 extra/images/testing/png/basn0g08.fig create mode 100644 extra/images/testing/png/basn0g08.png create mode 100644 extra/images/testing/png/basn0g16.fig create mode 100644 extra/images/testing/png/basn0g16.png diff --git a/basis/images/png/png-tests.factor b/basis/images/png/png-tests.factor index 858718e63f..25815c7017 100644 --- a/basis/images/png/png-tests.factor +++ b/basis/images/png/png-tests.factor @@ -7,6 +7,11 @@ IN: images.png.tests ! The subset of the suite that should work given the current implementation. "vocab:images/testing/png" [ + "basn0g01.png" decode-test + "basn0g02.png" decode-test + "basn0g04.png" decode-test + "basn0g08.png" decode-test + "basn0g16.png" decode-test "basn2c08.png" decode-test "basn6a08.png" decode-test "f00n2c08.png" decode-test diff --git a/basis/images/png/png.factor b/basis/images/png/png.factor index 6e8d7a6c1e..2135d3fc96 100644 --- a/basis/images/png/png.factor +++ b/basis/images/png/png.factor @@ -240,7 +240,7 @@ ERROR: unknown-component-type n ; : scale-factor ( n -- n' ) { { 1 [ 255 ] } - { 2 [ 127 ] } + { 2 [ 85 ] } { 4 [ 17 ] } } case ; diff --git a/extra/images/testing/png/basn0g01.fig b/extra/images/testing/png/basn0g01.fig new file mode 100644 index 0000000000000000000000000000000000000000..d79f71b46926a63b1cf0e8306e6d1fd8889f1f43 GIT binary patch literal 1081 zcmajcK@P$o5Cu?TypD%(@6roY(-;>mB-9X>nAEjL=uH)77=)qFE=q<6zXLrRJ>Q4! z*6TM8-Q2y@q86j=Nm`>nkIQrF4_7%TIrihEr5%sEz4*4D4Hs<}ZFda&X%&s3CC?29 zt~+vcpOoeYt~qhVBZIqOeCRHzb|XwtogOUA;Z)Wgt%kAmj4?mt!jN;}jJb1WUU2S# zLpxBdwN~*M?*A0t$l4$K3$9AjFe06y@1s;bWp^fD(%UCw90gYuOm_mC%H8oyc;6;z7cmE{-7; zb9B#azopr0C;FL=l}o! literal 0 HcmV?d00001 diff --git a/extra/images/testing/png/basn0g02.fig b/extra/images/testing/png/basn0g02.fig new file mode 100644 index 0000000000000000000000000000000000000000..3953ef55c12e6bc9ff5a62a64fe14e4e76f9634a GIT binary patch literal 1081 zcmWG3FK*4uO-xTMZi7&Xt%*$q3knvL7dQIkHW8tf$}#joChMzVRnQ3j?5kiw~WR={qr1hoC5$A))k)s literal 0 HcmV?d00001 diff --git a/extra/images/testing/png/basn0g02.png b/extra/images/testing/png/basn0g02.png new file mode 100644 index 0000000000000000000000000000000000000000..508332418fa86637d39e95268ec1d3658d120cae GIT binary patch literal 104 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk`Bp75C+I9jdmUKs7M+U~W1%@xC#RK{Bo-U3d z6?2jkIAXub_k1+y2sp$L+}6)%%qgEdVJADoUeEf*ZqCk?AR|0o{an^LB{Ts5miHSU literal 0 HcmV?d00001 diff --git a/extra/images/testing/png/basn0g04.fig b/extra/images/testing/png/basn0g04.fig new file mode 100644 index 0000000000000000000000000000000000000000..1e45ed142b8b327f2450c794a1a49165182dfec9 GIT binary patch literal 1081 zcmWG3FK*4uO-xTMZi7&Xt%*$q3knvL7dQIkHp(av-3!JU+WSfPmKWxcm*WdnORjS{_@N!|YxK1hke% rk8fnVcLM>f<&o1Gy4`1hfY$P`bdJsLyFfr|c~Bn1W%oNEptU>z;sf)L literal 0 HcmV?d00001 diff --git a/extra/images/testing/png/basn0g04.png b/extra/images/testing/png/basn0g04.png new file mode 100644 index 0000000000000000000000000000000000000000..0bf3687863d8a1f53bef0aa24b841b21b0e04d9e GIT binary patch literal 145 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk^Bp4VJkiH(a-NK8sj zNli=7$jr*l$<50zC@d;2DJ?6nsI024sjaJTXl!b3X>Duo=Fw*EFmcl4DO0CS zpD}aR>^XDi&0nx^(c&dbmn~nha@FcJYuBycuyNDoEnBy3-?4Mo?mc_=?LTnv(BUIT zj~zd8^3>@wXV0C#aPiXRD_5^wzj5={?K^kx-GA`#(c>pipFMx^^404%Z{NND@bS~< zFJHfX|MBzJ?>~S4{r~s(&+lJ9e|-P;^~>i^A3wZ*_x8=}S1(^YfA;jr<3|r4+`o7C z&h1+_Z(P52^~&W-7cZPYclONbQzuUxKX&xU;X?-x?BBO{&+c72cWmFbb<5^W8#k<9 zw|33yRV!C4U$%6~;zbJ=%%3-R&g@w;XH1_qb;{&P6DRcd_4agkb#}D3wYD@jH8#}O z)z(y3RaTUjm6jA26$0ZXHzzwQGb24MH6=MIF(E!KHYPeMG9o-IG$c4EFu>o>*T>t- z)5G1()y3J#(ZSx%*2db((!$)#)Wq1x&_G{LS4Ue*Q$t-%RYh4zQ9)i#Rz_M%QbJrz fR76-vP=KG0mxr5+lY^a&m4%s!aWwWvdh7!L64eu@ literal 0 HcmV?d00001 diff --git a/extra/images/testing/png/basn0g08.png b/extra/images/testing/png/basn0g08.png new file mode 100644 index 0000000000000000000000000000000000000000..23c82379a29ff4b99806bbbd2e2342c8fd97ee67 GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^3Lwk@BpAX3RW*PVOS+@4BLidG0>c;6;(>fePZ!6K ziaE(C2`UUC949vOu(I~>b7=nfE^nVuX&@tFa7u7Oddi~87#=p(p8gM~{{27yqy1T- hp#)Io!PL|g7KVVQ{|ZeX-G~HP;_2$=vd$@?2>|oDDeM3M literal 0 HcmV?d00001 diff --git a/extra/images/testing/png/basn0g16.fig b/extra/images/testing/png/basn0g16.fig new file mode 100644 index 0000000000000000000000000000000000000000..7218acd3b191cb67c6418783689fefcbf577fcec GIT binary patch literal 2106 zcmbu=Lha#x{@#6j?c@GG?{M!ifiZzGp>{_zn~uB074kac%~7}Qq~d6eokll}xVf^ke` zE=yR;HuiCx3*6)puldAJebz1Q*HTiFk(?BwB$cR5V_MUhUidSJQA}Vu^H|1uwsU}! zT;euQc*7TdD_&Q$QwvBYTPHinL@UFGVR!HR{ovc66sN0~yL#CNrBwtYR~}Il@`4ai15w=evICu})~6rjed( zGn?hKBR8csvsq3%%BN&zHp^*8ImBO_eJV2m literal 0 HcmV?d00001 diff --git a/extra/images/testing/png/basn0g16.png b/extra/images/testing/png/basn0g16.png new file mode 100644 index 0000000000000000000000000000000000000000..e7c82f78eb954be5be51c35bd287e00018c69d82 GIT binary patch literal 167 zcmeAS@N?(olHy`uVBq!ia0vp^3Lq>1BpBEle`W(ImUKs7M+U~W1%@xC#RK_qo-U3d z6?3j$GUPg7z~dZf8U4Qg*qsHF4`@^yUDaY)e6!!)qG9=taAD!(1y)T7vK%uR?lygM zIK}cp><*ign#1-5wiApPcd>47oWOZOH-mqPPlA0u`y2l+k{0Ld8N_aQ--utQJ^wn$ N1)i>cF6*2UngAzTID!BG literal 0 HcmV?d00001