Revert "ui.images, images.loader: move platform-specific image loader setup into...

This reverts commit 2bbf752cbeeccc555c66fcb2b16a29e0369765b8.

diff --git a/basis/images/loader/loader.factor b/basis/images/loader/loader.factor
index 461131fdf9dbae5033b2886df05c206c7b541055..7e1dc9ca3186f2fc1bd20aae5d7dec55ec052a9a 100644 (file)
--- 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 system vocabs.loader combinators ;
+unicode.case fry ;
 IN: images.loader
 
 ERROR: unknown-image-extension extension ;
@@ -51,13 +51,3 @@ 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 2ec04a532e52e0a9cf37322db57532be3d228d5a..7084f1aac1813b95da29c51ec6ef6e3bf4e0c7c8 100644 (file)
--- a/basis/ui/images/images.factor
+++ b/basis/ui/images/images.factor
@@ -31,3 +31,13 @@ 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
+>>