images: minor cleanup.

diff --git a/basis/images/loader/loader.factor b/basis/images/loader/loader.factor
index a50391b1bdeac0872edb81baa7fb8f072f031a01..71e3381ea60bd69656b53e1bf6fb750b5a3fc663 100644 (file)
--- a/basis/images/loader/loader.factor
+++ b/basis/images/loader/loader.factor
@@ -36,7 +36,7 @@ GENERIC: stream>image* ( stream class -- image )
     over types get key? [ 2drop ] [ register-image-class ] if ;
 
 : load-image ( path -- image )
-    [ binary <file-reader> ] [ image-class ] bi load-image* ;
+    dup image-class load-image* ;
 
 M: object load-image* stream>image ;
 

diff --git a/extra/images/bitmap/bitmap-tests.factor b/extra/images/bitmap/bitmap-tests.factor
index a9d7e4213455c4bb474a00c9aa42010667218fc9..0f2f9c8ab4abed96c72efaf460c075ab411c763c 100644 (file)
--- a/extra/images/bitmap/bitmap-tests.factor
+++ b/extra/images/bitmap/bitmap-tests.factor
@@ -1,8 +1,8 @@
 USING: images.bitmap images.testing kernel ;
 IN: images.bitmap.tests
 
-! "vocab:images/testing/bmp/1bit.bmp" decode-test
-! "vocab:images/testing/bmp/rgb_4bit.bmp" decode-test
+! "vocab:images/testing/bmp/1bit.bmp" bmp-image decode-test
+! "vocab:images/testing/bmp/rgb_4bit.bmp" bmp-image decode-test
 
 "vocab:images/testing/bmp/rgb_8bit.bmp" bmp-image
 [ decode-test ] [ encode-test ] 2bi