diff --git a/basis/images/loader/loader.factor b/basis/images/loader/loader.factor index 7e1dc9ca31..461131fdf9 100644 --- a/basis/images/loader/loader.factor +++ b/basis/images/loader/loader.factor @@ -3,7 +3,7 @@ USING: assocs byte-arrays io.encodings.binary io.files io.pathnames io.streams.byte-array io.streams.limited io.streams.throwing kernel namespaces sequences strings -unicode.case fry ; +unicode.case fry system vocabs.loader combinators ; IN: images.loader ERROR: unknown-image-extension extension ; @@ -51,3 +51,13 @@ GENERIC: image>stream ( image class -- ) [ image-class ] [ ] bi binary [ image>stream ] with-file-writer ; +<< +{ + { [ os macosx? ] [ "images.cocoa" require ] } + { [ os winnt? ] [ "images.gdiplus" require ] } + [ + "images.png" require + "images.tiff" require + ] +} cond +>> diff --git a/basis/ui/images/images.factor b/basis/ui/images/images.factor index 7084f1aac1..2ec04a532e 100644 --- a/basis/ui/images/images.factor +++ b/basis/ui/images/images.factor @@ -31,13 +31,3 @@ PRIVATE> : image-dim ( image-name -- dim ) cached-image dim>> ; -<< -{ - { [ os macosx? ] [ "images.cocoa" require ] } - { [ os winnt? ] [ "images.gdiplus" require ] } - [ - "images.png" require - "images.tiff" require - ] -} cond ->>