From 4c7a88c8a40306ee97957863e76423916991ad3e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Philipp=20Br=C3=BCschweiler?= Date: Sat, 31 Jul 2010 20:34:15 +0200 Subject: [PATCH] images: fix some tests that broke due to an additional slot in image --- basis/images/images-tests.factor | 4 ++-- .../tesselation/tesselation-tests.factor | 16 ++++++++-------- extra/images/testing/bmp/42red_24bit.fig | Bin 5179 -> 5180 bytes extra/images/testing/bmp/rgb_8bit.fig | Bin 30059 -> 30060 bytes extra/images/testing/gif/alpha.fig | Bin 74 -> 75 bytes .../testing/gif/astronaut_animation.fig | Bin 7132 -> 7133 bytes extra/images/testing/gif/checkmark.fig | Bin 3540 -> 3541 bytes extra/images/testing/gif/circle.fig | Bin 460 -> 461 bytes extra/images/testing/gif/monochrome.fig | Bin 203 -> 204 bytes extra/images/testing/gif/noise.fig | Bin 65599 -> 65600 bytes extra/images/testing/pbm/test.ascii.fig | Bin 25659 -> 25660 bytes extra/images/testing/pbm/test.binary.fig | Bin 25659 -> 25660 bytes extra/images/testing/pgm/radial.ascii.fig | Bin 16443 -> 16444 bytes extra/images/testing/pgm/radial.binary.fig | Bin 16443 -> 16444 bytes extra/images/testing/png/basn2c08.fig | Bin 3131 -> 3132 bytes extra/images/testing/png/basn6a08.fig | Bin 4156 -> 4157 bytes extra/images/testing/png/f00n2c08.fig | Bin 3131 -> 3132 bytes extra/images/testing/png/f01n2c08.fig | Bin 3131 -> 3132 bytes extra/images/testing/png/f02n2c08.fig | Bin 3131 -> 3132 bytes extra/images/testing/png/f03n2c08.fig | Bin 3131 -> 3132 bytes extra/images/testing/png/f04n2c08.fig | Bin 3131 -> 3132 bytes extra/images/testing/png/z00n2c08.fig | Bin 3131 -> 3132 bytes extra/images/testing/png/z03n2c08.fig | Bin 3131 -> 3132 bytes extra/images/testing/png/z06n2c08.fig | Bin 3131 -> 3132 bytes extra/images/testing/png/z09n2c08.fig | Bin 3131 -> 3132 bytes extra/images/testing/ppm/ascii.fig | Bin 57660 -> 57661 bytes extra/images/testing/ppm/binary.fig | Bin 57660 -> 57661 bytes extra/images/testing/tiff/alpha.fig | Bin 74 -> 75 bytes extra/images/testing/tiff/color_spectrum.fig | Bin 117567 -> 117568 bytes extra/images/testing/tiff/noise.fig | Bin 49213 -> 49214 bytes extra/images/testing/tiff/octagon.fig | Bin 4156 -> 4157 bytes extra/images/testing/tiff/rgb.fig | Bin 268899 -> 268900 bytes extra/model-viewer/model-viewer.factor | 14 ++++++++++---- 33 files changed, 20 insertions(+), 14 deletions(-) diff --git a/basis/images/images-tests.factor b/basis/images/images-tests.factor index ff49834a65..1fda9b3b81 100644 --- a/basis/images/images-tests.factor +++ b/basis/images/images-tests.factor @@ -3,7 +3,7 @@ USING: images tools.test kernel accessors ; IN: images.tests -[ B{ 57 57 57 255 } ] [ 1 1 T{ image f { 2 3 } RGBA ubyte-components f B{ +[ B{ 57 57 57 255 } ] [ 1 1 T{ image f { 2 3 } RGBA ubyte-components f f B{ 0 0 0 0 0 0 0 0 0 0 0 0 @@ -19,7 +19,7 @@ IN: images.tests 57 57 57 255 0 0 0 0 0 0 0 0 -} ] [ B{ 57 57 57 255 } 1 1 T{ image f { 2 3 } RGBA ubyte-components f B{ +} ] [ B{ 57 57 57 255 } 1 1 T{ image f { 2 3 } RGBA ubyte-components f f B{ 0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/basis/images/tesselation/tesselation-tests.factor b/basis/images/tesselation/tesselation-tests.factor index 9db58649a0..5999c15d5c 100644 --- a/basis/images/tesselation/tesselation-tests.factor +++ b/basis/images/tesselation/tesselation-tests.factor @@ -10,12 +10,12 @@ IN: images.tesselation [ { { - T{ image f { 2 2 } L ubyte-components f B{ 1 2 5 6 } } - T{ image f { 2 2 } L ubyte-components f B{ 3 4 7 8 } } + T{ image f { 2 2 } L ubyte-components f f B{ 1 2 5 6 } } + T{ image f { 2 2 } L ubyte-components f f B{ 3 4 7 8 } } } { - T{ image f { 2 2 } L ubyte-components f B{ 9 10 13 14 } } - T{ image f { 2 2 } L ubyte-components f B{ 11 12 15 16 } } + T{ image f { 2 2 } L ubyte-components f f B{ 9 10 13 14 } } + T{ image f { 2 2 } L ubyte-components f f B{ 11 12 15 16 } } } } ] [ @@ -30,12 +30,12 @@ IN: images.tesselation [ { { - T{ image f { 2 2 } L ubyte-components f B{ 1 2 4 5 } } - T{ image f { 1 2 } L ubyte-components f B{ 3 6 } } + T{ image f { 2 2 } L ubyte-components f f B{ 1 2 4 5 } } + T{ image f { 1 2 } L ubyte-components f f B{ 3 6 } } } { - T{ image f { 2 1 } L ubyte-components f B{ 7 8 } } - T{ image f { 1 1 } L ubyte-components f B{ 9 } } + T{ image f { 2 1 } L ubyte-components f f B{ 7 8 } } + T{ image f { 1 1 } L ubyte-components f f B{ 9 } } } } ] [ diff --git a/extra/images/testing/bmp/42red_24bit.fig b/extra/images/testing/bmp/42red_24bit.fig index 9c2ce17edbc877ef4b7117ca90e7b980b2c30800..4616f0dce28c8f1a3ac7368bf5aaed56df4f8fe9 100644 GIT binary patch delta 112 zcmdn3u}4EVq`bH_GdD3kwYUvJCALizR$<9=WD=R&$YwDyztT{0tZ1Oq2oXH>9y(WL)iJKUZ vHTeu*9*8?JKz4FI58LDf?no#t4OFQM#72|iOmnxMHnYP;N+j2 Vz#23;fTe2k22TFX+nKf$0RXPL8Q%Z^ delta 72 zcmaF!it+U;M&Xe1;?~UE#PrnSHVBp2I#F1K#gVDhV6q@{+T;xaJd+FfI5$7A6Jwmb ZUO;}bf#}}J4kA30cQbKr-p91A2mlU=8sh)} diff --git a/extra/images/testing/gif/alpha.fig b/extra/images/testing/gif/alpha.fig index b36a8f6666f5776bedf5ff9a0d10cc4dc9e8e3a8..46dc59425a47efd97e17eecd6255b49c615da96d 100644 GIT binary patch delta 45 ncmebB77i&dZq3Y1OiwLtgHVZW6NOcU^BgDqXJ7y#2mrAGbLI}* delta 44 mcmebF5)LUZZq3Y1OiwLtgHVaB6NOcU94Gu|U;rWr0I>mK@(yeO diff --git a/extra/images/testing/gif/astronaut_animation.fig b/extra/images/testing/gif/astronaut_animation.fig index 905da6d827a7f7ec2e0828a8fe14fe0acfae5ffa..88e8e9bd18c463aa884f4f85e79adde150831813 100644 GIT binary patch delta 40 rcmca(e%D+$q`bH_GdD3kwYUvJCALizR%Oj|WRhMmu~B1VN`*84Pzn!o delta 39 qcmca>e#cxmq`bH_GdD3kwYUvJCALl!R%LNyl3pHq)$ delta 40 rcmcaAeMMS0q`bH_GdD3kwYUvJCALl!R%LNy;+-*BkvC=ILK9v9Kur#N diff --git a/extra/images/testing/gif/circle.fig b/extra/images/testing/gif/circle.fig index 330397f7d72a0e59d5907fb2875061af67a5ad55..9f291efb331dbacdf8cd232241892636d4135006 100644 GIT binary patch delta 31 icmX@Ze3n@_q`bH_GdD3kwYUvJCALizR^4bml@S2N>I@bD diff --git a/extra/images/testing/gif/monochrome.fig b/extra/images/testing/gif/monochrome.fig index 69de84564eefd3e015bece2d117f1ad565a7fe31..3c03fe22c395e925ac32f59ca414227cbd5bb4e0 100644 GIT binary patch delta 30 hcmX@jc!p6pq`bH_GdD3kwYUvJCALizR-I@*1pv6q3+?~_ delta 40 rcmX@Zc$!f-q`bH_GdD3kwYUvJCALl!R%Lc%oG{T*cwzv{#NbK*I3^B_ diff --git a/extra/images/testing/gif/noise.fig b/extra/images/testing/gif/noise.fig index a2650e971fd0d6a6ff7d38028db8c75aaef37edf..c4d6aa43c70d9388b97a40c685ea347ea1043bc8 100644 GIT binary patch delta 35 mcmdnrz;d90ML49qxHU63F+H`o4MHWhO%zsdw47?m$OZuYf(;P> delta 35 mcmX@mz_P!AML49qxHU63F+H`o4MHWhP83#ew4Q3s$O-`ciVYJ0 diff --git a/extra/images/testing/pbm/test.ascii.fig b/extra/images/testing/pbm/test.ascii.fig index aee805ec6985a325ad215ee428ef13f16dc889c4..ae2174290a1f588929883556220b9a992c093168 100644 GIT binary patch delta 115 zcmdmef^p9YM&Xe1;?~UE#PrnSHVBp2Hc?oGCC`y5W%9-7?uiNflRvn-PE3fJ#4k8G gATVWOg7zeSAqYzo&H{=dWHDGella*eTeHRk02uNr4FCWD delta 110 zcmdmUf^qi=M&Xe1;?~UE#PrnSHVBp2I#F1K*^wz_vS4iQfUu?q~4*-TQD;EF& diff --git a/extra/images/testing/pbm/test.binary.fig b/extra/images/testing/pbm/test.binary.fig index aee805ec6985a325ad215ee428ef13f16dc889c4..ae2174290a1f588929883556220b9a992c093168 100644 GIT binary patch delta 115 zcmdmef^p9YM&Xe1;?~UE#PrnSHVBp2Hc?oGCC`y5W%9-7?uiNflRvn-PE3fJ#4k8G gATVWOg7zeSAqYzo&H{=dWHDGella*eTeHRk02uNr4FCWD delta 110 zcmdmUf^qi=M&Xe1;?~UE#PrnSHVBp2I#F1K*^wz_vS4iQfUu?q~4*-TQD;EF& diff --git a/extra/images/testing/pgm/radial.ascii.fig b/extra/images/testing/pgm/radial.ascii.fig index 6e52311b94202145e080cf8f4dc7794d43490754..4fce1e636cb0cd0ef0f0babfe362afc623dd2c7d 100644 GIT binary patch delta 33 kcmdnpz__P@Q8=W$xHU63F+H`o4MHWhO%ztyXvXRQ0O3dsod5s; delta 33 kcmdnfz_`1CQ8=W$xHU63F+H`o4MHWhP83$zXu;wD0O3arod5s; diff --git a/extra/images/testing/pgm/radial.binary.fig b/extra/images/testing/pgm/radial.binary.fig index 6e52311b94202145e080cf8f4dc7794d43490754..4fce1e636cb0cd0ef0f0babfe362afc623dd2c7d 100644 GIT binary patch delta 33 kcmdnpz__P@Q8=W$xHU63F+H`o4MHWhO%ztyXvXRQ0O3dsod5s; delta 33 kcmdnfz_`1CQ8=W$xHU63F+H`o4MHWhP83$zXu;wD0O3arod5s; diff --git a/extra/images/testing/png/basn2c08.fig b/extra/images/testing/png/basn2c08.fig index 84f8c97b931b3cca7e8b88467380408d08dda514..655695610dfa983adc491f004ace769e81901b0b 100644 GIT binary patch delta 31 icmdlju}4BUq`bH_GdD3kwYUvJCALizR@rFA$^!t!l?#^u delta 31 icmdlZv0Fkoq`bH_GdD3kwYUvJCALl!R@rF5!UF)slM9ys diff --git a/extra/images/testing/png/basn6a08.fig b/extra/images/testing/png/basn6a08.fig index f188879876599d23890b964b0ea157f64c3b2d72..723e1b419230711f140db00ddaeaac38afe262f3 100644 GIT binary patch delta 31 icmdm^uvbAiq`bH_GdD3kwYUvJCALizR^4dMDgXe-tqZRJ delta 31 icmdn1utz~Sq`bH_GdD3kwYUvJCALl!R^4dHA^-r#s|&9H diff --git a/extra/images/testing/png/f00n2c08.fig b/extra/images/testing/png/f00n2c08.fig index 6a6aef9b0f9e6e1b8bd1bdc2c056395598894bdf..f2e7a981ba7a531617a50e649dba523706b4612f 100644 GIT binary patch delta 31 icmdlju}4BUq`bH_GdD3kwYUvJCALizR@rFA$^!t!l?#^u delta 31 icmdlZv0Fkoq`bH_GdD3kwYUvJCALl!R@rF5!UF)slM9ys diff --git a/extra/images/testing/png/f01n2c08.fig b/extra/images/testing/png/f01n2c08.fig index f08c0bbee3f8c6dc780e90a61657632ce012aac0..097a24a849648ee426419091b14f3061fdd04111 100644 GIT binary patch delta 31 icmdlju}4BUq`bH_GdD3kwYUvJCALizR@rFA$^!t!l?#^u delta 31 icmdlZv0Fkoq`bH_GdD3kwYUvJCALl!R@rF5!UF)slM9ys diff --git a/extra/images/testing/png/f02n2c08.fig b/extra/images/testing/png/f02n2c08.fig index 722f02a5ff03d74adb5191a4216f60132287d19e..3a6a60106a1787bb6d73d8ec589be2be5c07bbf8 100644 GIT binary patch delta 31 icmdlju}4BUq`bH_GdD3kwYUvJCALizR@rFA$^!t!l?#^u delta 31 icmdlZv0Fkoq`bH_GdD3kwYUvJCALl!R@rF5!UF)slM9ys diff --git a/extra/images/testing/png/f03n2c08.fig b/extra/images/testing/png/f03n2c08.fig index 2a37fe6c7bd9e7ddd17da74a950be5446eff9ea6..ae91abddb729b22eebb1e56e4152e0a8c062cc5d 100644 GIT binary patch delta 31 icmdlju}4BUq`bH_GdD3kwYUvJCALizR@rFA$^!t!l?#^u delta 31 icmdlZv0Fkoq`bH_GdD3kwYUvJCALl!R@rF5!UF)slM9ys diff --git a/extra/images/testing/png/f04n2c08.fig b/extra/images/testing/png/f04n2c08.fig index c0db771fa4c96be556e71fefbac36107943cf1d8..8116a4554290310083615016b870b950db00492a 100644 GIT binary patch delta 31 icmdlju}4BUq`bH_GdD3kwYUvJCALizR@rFA$^!t!l?#^u delta 31 icmdlZv0Fkoq`bH_GdD3kwYUvJCALl!R@rF5!UF)slM9ys diff --git a/extra/images/testing/png/z00n2c08.fig b/extra/images/testing/png/z00n2c08.fig index 9d171e68b750d75b3cf68ee47b1f8a147470d381..79e5991dbb03ff5b93575061db2fbd447468382e 100644 GIT binary patch delta 31 icmdlju}4BUq`bH_GdD3kwYUvJCALizR@rFA$^!t!l?#^u delta 31 icmdlZv0Fkoq`bH_GdD3kwYUvJCALl!R@rF5!UF)slM9ys diff --git a/extra/images/testing/png/z03n2c08.fig b/extra/images/testing/png/z03n2c08.fig index 9d171e68b750d75b3cf68ee47b1f8a147470d381..79e5991dbb03ff5b93575061db2fbd447468382e 100644 GIT binary patch delta 31 icmdlju}4BUq`bH_GdD3kwYUvJCALizR@rFA$^!t!l?#^u delta 31 icmdlZv0Fkoq`bH_GdD3kwYUvJCALl!R@rF5!UF)slM9ys diff --git a/extra/images/testing/png/z06n2c08.fig b/extra/images/testing/png/z06n2c08.fig index 9d171e68b750d75b3cf68ee47b1f8a147470d381..79e5991dbb03ff5b93575061db2fbd447468382e 100644 GIT binary patch delta 31 icmdlju}4BUq`bH_GdD3kwYUvJCALizR@rFA$^!t!l?#^u delta 31 icmdlZv0Fkoq`bH_GdD3kwYUvJCALl!R@rF5!UF)slM9ys diff --git a/extra/images/testing/png/z09n2c08.fig b/extra/images/testing/png/z09n2c08.fig index 9d171e68b750d75b3cf68ee47b1f8a147470d381..79e5991dbb03ff5b93575061db2fbd447468382e 100644 GIT binary patch delta 31 icmdlju}4BUq`bH_GdD3kwYUvJCALizR@rFA$^!t!l?#^u delta 31 icmdlZv0Fkoq`bH_GdD3kwYUvJCALl!R@rF5!UF)slM9ys diff --git a/extra/images/testing/ppm/ascii.fig b/extra/images/testing/ppm/ascii.fig index 68a1fa1ac10fd7c8dcdddb7407527bd327f83baf..9f95883c38bbeb57b2d265a2a8d8f0fc19a4d6ec 100644 GIT binary patch delta 65 zcmdmUhmK@(yeO diff --git a/extra/images/testing/tiff/color_spectrum.fig b/extra/images/testing/tiff/color_spectrum.fig index 7050c13f6c865f9d2b28589742cfe2faa119e2e6..5213f8d30ed7420c0d9cddb4f1818c6ede934ca9 100644 GIT binary patch delta 48 zcmdl#js3thcHxln;?~UE#PrnSHVBp2Hc?oeHP4Zm@$^Q=djiceg4<;T8I^Yd0M6wR Ai2wiq delta 47 zcmX>wjeY+#cHxln;?~UE#PrnSHVBp2I#F1i#gUou^hU?~0?l%Q+vNlqm39FDyKWI3 diff --git a/extra/images/testing/tiff/noise.fig b/extra/images/testing/tiff/noise.fig index dd582aaef329e1c2962f815148dce85dcda02823..e207120c9dfd334e8ad4430e34c515e11a42ce40 100644 GIT binary patch delta 33 kcmdnnz`U=4SvaJ;xHU63F+H`o4MHWhO%zt!Xu)~_0OHIIDF6Tf delta 33 kcmdnjz`VDCSvaJ;xHU63F+H`o4MHWhP83$#XvJ~>0OHFHDF6Tf diff --git a/extra/images/testing/tiff/octagon.fig b/extra/images/testing/tiff/octagon.fig index 0b66c62662120287e7c6ff5de4b3c356a8ee3b81..9273f3edaa5459e6c41677b70f297574206ed1c9 100644 GIT binary patch delta 40 rcmdm^uvbAiq`bH_GdD3kwYUvJCALizR%OX^WD=OH&!@UE;SN6lIo}Rw delta 39 qcmdn1utz~Sq`bH_GdD3kwYUvJCALl!R%Lc%5}0hjr@Arm4nF`X@eTR_ diff --git a/extra/images/testing/tiff/rgb.fig b/extra/images/testing/tiff/rgb.fig index c09b1cd10e2b21e1e543015c5f6e5b33e0c699eb..8fb52821ff0b4ed74ee2158673f8c7c74b73617d 100644 GIT binary patch delta 45 wcmaF7Mc~O60pXDH;?~UE#PrnSHVBp2Hc?o;(X!Q&vDK2P)slIuC5x660JAU + { 1 1 } >>dim + BGR >>component-order + ubyte-components >>component-type + B{ 255 255 255 } >>bitmap ; : up-image ( -- image ) - { 1 1 } BGR ubyte-components f - B{ 0 0 0 } image boa ; + + { 1 1 } >>dim + BGR >>component-order + ubyte-components >>component-type + B{ 0 0 0 } >>bitmap ; : make-texture ( pathname alt -- texture ) swap [ nip load-image ] [ ] if* -- 2.34.1