From 74dc8db962c7f31ab7b9503153f21e1a2be41171 Mon Sep 17 00:00:00 2001
From: Joe Groff <arcata@gmail.com>
Date: Fri, 16 Jul 2010 11:36:20 -0700
Subject: [PATCH] Revert "ui.images, images.loader: move platform-specific
 image loader setup into images.loader"

This reverts commit 2bbf752cbeeccc555c66fcb2b16a29e0369765b8.
---
 basis/images/loader/loader.factor | 12 +-----------
 basis/ui/images/images.factor     | 10 ++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/basis/images/loader/loader.factor b/basis/images/loader/loader.factor
index 461131fdf9..7e1dc9ca31 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 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 2ec04a532e..7084f1aac1 100644
--- 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
+>>