From ab76deaf255e9cc54341ff348d132908b14cac75 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Fri, 14 Mar 2014 08:26:05 -0700 Subject: [PATCH] images: minor cleanup. --- basis/images/loader/loader.factor | 2 +- extra/images/bitmap/bitmap-tests.factor | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/basis/images/loader/loader.factor b/basis/images/loader/loader.factor index a50391b1bd..71e3381ea6 100644 --- 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 ] [ 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 a9d7e42134..0f2f9c8ab4 100644 --- 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