Merge remote branch 'Blei/Native-image-loader' into native-image-loader

diff --git a/basis/images/gdiplus/platforms.txt b/basis/images/gdiplus/platforms.txt
new file mode 100644 (file)
index 0000000..8e1a559
--- /dev/null
+++ b/basis/images/gdiplus/platforms.txt
@@ -0,0 +1 @@
+windows

diff --git a/basis/images/images-tests.factor b/basis/images/images-tests.factor
index ff49834a65a9dcb0eec8179a5d7946cd2b892ce0..1fda9b3b813af067296c52279f3802ef2dd51b21 100644 (file)
--- 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 9db58649a0c42062bf92e6a96bc617facc2ca45c..5999c15d5cb9589f6630146008daeb0c877e46b4 100644 (file)
--- 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 (file)
Binary files a/extra/images/testing/bmp/42red_24bit.fig and b/extra/images/testing/bmp/42red_24bit.fig differ

diff --git a/extra/images/testing/bmp/rgb_8bit.fig b/extra/images/testing/bmp/rgb_8bit.fig
index 4b75a10dc060c66b7261f130c244f407fb4dbec2..776d302469bb0c05b61a774b9d726431dfbd8b5c 100644 (file)
Binary files a/extra/images/testing/bmp/rgb_8bit.fig and b/extra/images/testing/bmp/rgb_8bit.fig differ

diff --git a/extra/images/testing/gif/alpha.fig b/extra/images/testing/gif/alpha.fig
index b36a8f6666f5776bedf5ff9a0d10cc4dc9e8e3a8..46dc59425a47efd97e17eecd6255b49c615da96d 100644 (file)
Binary files a/extra/images/testing/gif/alpha.fig and b/extra/images/testing/gif/alpha.fig differ

diff --git a/extra/images/testing/gif/astronaut_animation.fig b/extra/images/testing/gif/astronaut_animation.fig
index 905da6d827a7f7ec2e0828a8fe14fe0acfae5ffa..88e8e9bd18c463aa884f4f85e79adde150831813 100644 (file)
Binary files a/extra/images/testing/gif/astronaut_animation.fig and b/extra/images/testing/gif/astronaut_animation.fig differ

diff --git a/extra/images/testing/gif/checkmark.fig b/extra/images/testing/gif/checkmark.fig
index c177d892509796c6f59e3a63fa9bffd0d32cadce..70556be3e7d0c7a04c99bff75373486acad05f45 100644 (file)
Binary files a/extra/images/testing/gif/checkmark.fig and b/extra/images/testing/gif/checkmark.fig differ

diff --git a/extra/images/testing/gif/circle.fig b/extra/images/testing/gif/circle.fig
index 330397f7d72a0e59d5907fb2875061af67a5ad55..9f291efb331dbacdf8cd232241892636d4135006 100644 (file)
Binary files a/extra/images/testing/gif/circle.fig and b/extra/images/testing/gif/circle.fig differ

diff --git a/extra/images/testing/gif/monochrome.fig b/extra/images/testing/gif/monochrome.fig
index 69de84564eefd3e015bece2d117f1ad565a7fe31..3c03fe22c395e925ac32f59ca414227cbd5bb4e0 100644 (file)
Binary files a/extra/images/testing/gif/monochrome.fig and b/extra/images/testing/gif/monochrome.fig differ

diff --git a/extra/images/testing/gif/noise.fig b/extra/images/testing/gif/noise.fig
index a2650e971fd0d6a6ff7d38028db8c75aaef37edf..c4d6aa43c70d9388b97a40c685ea347ea1043bc8 100644 (file)
Binary files a/extra/images/testing/gif/noise.fig and b/extra/images/testing/gif/noise.fig differ

diff --git a/extra/images/testing/pbm/test.ascii.fig b/extra/images/testing/pbm/test.ascii.fig
index aee805ec6985a325ad215ee428ef13f16dc889c4..ae2174290a1f588929883556220b9a992c093168 100644 (file)
Binary files a/extra/images/testing/pbm/test.ascii.fig and b/extra/images/testing/pbm/test.ascii.fig differ

diff --git a/extra/images/testing/pbm/test.binary.fig b/extra/images/testing/pbm/test.binary.fig
index aee805ec6985a325ad215ee428ef13f16dc889c4..ae2174290a1f588929883556220b9a992c093168 100644 (file)
Binary files a/extra/images/testing/pbm/test.binary.fig and b/extra/images/testing/pbm/test.binary.fig differ

diff --git a/extra/images/testing/pgm/radial.ascii.fig b/extra/images/testing/pgm/radial.ascii.fig
index 6e52311b94202145e080cf8f4dc7794d43490754..4fce1e636cb0cd0ef0f0babfe362afc623dd2c7d 100644 (file)
Binary files a/extra/images/testing/pgm/radial.ascii.fig and b/extra/images/testing/pgm/radial.ascii.fig differ

diff --git a/extra/images/testing/pgm/radial.binary.fig b/extra/images/testing/pgm/radial.binary.fig
index 6e52311b94202145e080cf8f4dc7794d43490754..4fce1e636cb0cd0ef0f0babfe362afc623dd2c7d 100644 (file)
Binary files a/extra/images/testing/pgm/radial.binary.fig and b/extra/images/testing/pgm/radial.binary.fig differ

diff --git a/extra/images/testing/png/basn2c08.fig b/extra/images/testing/png/basn2c08.fig
index 84f8c97b931b3cca7e8b88467380408d08dda514..655695610dfa983adc491f004ace769e81901b0b 100644 (file)
Binary files a/extra/images/testing/png/basn2c08.fig and b/extra/images/testing/png/basn2c08.fig differ

diff --git a/extra/images/testing/png/basn6a08.fig b/extra/images/testing/png/basn6a08.fig
index f188879876599d23890b964b0ea157f64c3b2d72..723e1b419230711f140db00ddaeaac38afe262f3 100644 (file)
Binary files a/extra/images/testing/png/basn6a08.fig and b/extra/images/testing/png/basn6a08.fig differ

diff --git a/extra/images/testing/png/f00n2c08.fig b/extra/images/testing/png/f00n2c08.fig
index 6a6aef9b0f9e6e1b8bd1bdc2c056395598894bdf..f2e7a981ba7a531617a50e649dba523706b4612f 100644 (file)
Binary files a/extra/images/testing/png/f00n2c08.fig and b/extra/images/testing/png/f00n2c08.fig differ

diff --git a/extra/images/testing/png/f01n2c08.fig b/extra/images/testing/png/f01n2c08.fig
index f08c0bbee3f8c6dc780e90a61657632ce012aac0..097a24a849648ee426419091b14f3061fdd04111 100644 (file)
Binary files a/extra/images/testing/png/f01n2c08.fig and b/extra/images/testing/png/f01n2c08.fig differ

diff --git a/extra/images/testing/png/f02n2c08.fig b/extra/images/testing/png/f02n2c08.fig
index 722f02a5ff03d74adb5191a4216f60132287d19e..3a6a60106a1787bb6d73d8ec589be2be5c07bbf8 100644 (file)
Binary files a/extra/images/testing/png/f02n2c08.fig and b/extra/images/testing/png/f02n2c08.fig differ

diff --git a/extra/images/testing/png/f03n2c08.fig b/extra/images/testing/png/f03n2c08.fig
index 2a37fe6c7bd9e7ddd17da74a950be5446eff9ea6..ae91abddb729b22eebb1e56e4152e0a8c062cc5d 100644 (file)
Binary files a/extra/images/testing/png/f03n2c08.fig and b/extra/images/testing/png/f03n2c08.fig differ

diff --git a/extra/images/testing/png/f04n2c08.fig b/extra/images/testing/png/f04n2c08.fig
index c0db771fa4c96be556e71fefbac36107943cf1d8..8116a4554290310083615016b870b950db00492a 100644 (file)
Binary files a/extra/images/testing/png/f04n2c08.fig and b/extra/images/testing/png/f04n2c08.fig differ

diff --git a/extra/images/testing/png/z00n2c08.fig b/extra/images/testing/png/z00n2c08.fig
index 9d171e68b750d75b3cf68ee47b1f8a147470d381..79e5991dbb03ff5b93575061db2fbd447468382e 100644 (file)
Binary files a/extra/images/testing/png/z00n2c08.fig and b/extra/images/testing/png/z00n2c08.fig differ

diff --git a/extra/images/testing/png/z03n2c08.fig b/extra/images/testing/png/z03n2c08.fig
index 9d171e68b750d75b3cf68ee47b1f8a147470d381..79e5991dbb03ff5b93575061db2fbd447468382e 100644 (file)
Binary files a/extra/images/testing/png/z03n2c08.fig and b/extra/images/testing/png/z03n2c08.fig differ

diff --git a/extra/images/testing/png/z06n2c08.fig b/extra/images/testing/png/z06n2c08.fig
index 9d171e68b750d75b3cf68ee47b1f8a147470d381..79e5991dbb03ff5b93575061db2fbd447468382e 100644 (file)
Binary files a/extra/images/testing/png/z06n2c08.fig and b/extra/images/testing/png/z06n2c08.fig differ

diff --git a/extra/images/testing/png/z09n2c08.fig b/extra/images/testing/png/z09n2c08.fig
index 9d171e68b750d75b3cf68ee47b1f8a147470d381..79e5991dbb03ff5b93575061db2fbd447468382e 100644 (file)
Binary files a/extra/images/testing/png/z09n2c08.fig and b/extra/images/testing/png/z09n2c08.fig differ

diff --git a/extra/images/testing/ppm/ascii.fig b/extra/images/testing/ppm/ascii.fig
index 68a1fa1ac10fd7c8dcdddb7407527bd327f83baf..9f95883c38bbeb57b2d265a2a8d8f0fc19a4d6ec 100644 (file)
Binary files a/extra/images/testing/ppm/ascii.fig and b/extra/images/testing/ppm/ascii.fig differ

diff --git a/extra/images/testing/ppm/binary.fig b/extra/images/testing/ppm/binary.fig
index 68a1fa1ac10fd7c8dcdddb7407527bd327f83baf..9f95883c38bbeb57b2d265a2a8d8f0fc19a4d6ec 100644 (file)
Binary files a/extra/images/testing/ppm/binary.fig and b/extra/images/testing/ppm/binary.fig differ

diff --git a/extra/images/testing/tiff/alpha.fig b/extra/images/testing/tiff/alpha.fig
index b36a8f6666f5776bedf5ff9a0d10cc4dc9e8e3a8..46dc59425a47efd97e17eecd6255b49c615da96d 100644 (file)
Binary files a/extra/images/testing/tiff/alpha.fig and b/extra/images/testing/tiff/alpha.fig differ

diff --git a/extra/images/testing/tiff/color_spectrum.fig b/extra/images/testing/tiff/color_spectrum.fig
index 7050c13f6c865f9d2b28589742cfe2faa119e2e6..5213f8d30ed7420c0d9cddb4f1818c6ede934ca9 100644 (file)
Binary files a/extra/images/testing/tiff/color_spectrum.fig and b/extra/images/testing/tiff/color_spectrum.fig differ

diff --git a/extra/images/testing/tiff/noise.fig b/extra/images/testing/tiff/noise.fig
index dd582aaef329e1c2962f815148dce85dcda02823..e207120c9dfd334e8ad4430e34c515e11a42ce40 100644 (file)
Binary files a/extra/images/testing/tiff/noise.fig and b/extra/images/testing/tiff/noise.fig differ

diff --git a/extra/images/testing/tiff/octagon.fig b/extra/images/testing/tiff/octagon.fig
index 0b66c62662120287e7c6ff5de4b3c356a8ee3b81..9273f3edaa5459e6c41677b70f297574206ed1c9 100644 (file)
Binary files a/extra/images/testing/tiff/octagon.fig and b/extra/images/testing/tiff/octagon.fig differ

diff --git a/extra/images/testing/tiff/rgb.fig b/extra/images/testing/tiff/rgb.fig
index c09b1cd10e2b21e1e543015c5f6e5b33e0c699eb..8fb52821ff0b4ed74ee2158673f8c7c74b73617d 100644 (file)
Binary files a/extra/images/testing/tiff/rgb.fig and b/extra/images/testing/tiff/rgb.fig differ

diff --git a/extra/model-viewer/model-viewer.factor b/extra/model-viewer/model-viewer.factor
index b78862d225fa10bf784d9f9af6be06dd22525e9d..44a086a9e6524a167a2372aef09879ecfb372c98 100644 (file)
--- a/extra/model-viewer/model-viewer.factor
+++ b/extra/model-viewer/model-viewer.factor
@@ -88,12 +88,18 @@ TUPLE: vbo
     index-buffer index-count vertex-format texture bump ka ;
 
 : white-image ( -- image )
-    { 1 1 } BGR ubyte-components f
-    B{ 255 255 255 } image boa ;
+    <image>
+        { 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 ;
+    <image>
+        { 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*