diff --git a/basis/images/cocoa/authors.txt b/basis/images/loader/cocoa/authors.txt similarity index 100% rename from basis/images/cocoa/authors.txt rename to basis/images/loader/cocoa/authors.txt diff --git a/basis/images/cocoa/cocoa.factor b/basis/images/loader/cocoa/cocoa.factor similarity index 97% rename from basis/images/cocoa/cocoa.factor rename to basis/images/loader/cocoa/cocoa.factor index 449dab2fc5..6680a4f317 100644 --- a/basis/images/cocoa/cocoa.factor +++ b/basis/images/loader/cocoa/cocoa.factor @@ -5,7 +5,7 @@ combinators core-foundation.data core-graphics core-graphics.types fry locals images images.loader io kernel math sequences ; FROM: system => os macosx? ; -IN: images.cocoa +IN: images.loader.cocoa SINGLETON: ns-image diff --git a/basis/images/cocoa/platforms.txt b/basis/images/loader/cocoa/platforms.txt similarity index 100% rename from basis/images/cocoa/platforms.txt rename to basis/images/loader/cocoa/platforms.txt diff --git a/basis/images/cocoa/summary.txt b/basis/images/loader/cocoa/summary.txt similarity index 100% rename from basis/images/cocoa/summary.txt rename to basis/images/loader/cocoa/summary.txt diff --git a/basis/images/gdiplus/gdiplus.factor b/basis/images/loader/gdiplus/gdiplus.factor similarity index 95% rename from basis/images/gdiplus/gdiplus.factor rename to basis/images/loader/gdiplus/gdiplus.factor index 1bdb6526f2..3ac0e2accf 100644 --- a/basis/images/gdiplus/gdiplus.factor +++ b/basis/images/loader/gdiplus/gdiplus.factor @@ -4,7 +4,7 @@ classes.struct destructors images images.loader kernel locals math windows.com windows.gdiplus windows.streams windows.types typed byte-arrays grouping sequences ; FROM: system => os windows? ; -IN: images.gdiplus +IN: images.loader.gdiplus SINGLETON: gdi+-image diff --git a/basis/images/gdiplus/platforms.txt b/basis/images/loader/gdiplus/platforms.txt similarity index 100% rename from basis/images/gdiplus/platforms.txt rename to basis/images/loader/gdiplus/platforms.txt diff --git a/basis/images/gtk/authors.txt b/basis/images/loader/gtk/authors.txt similarity index 100% rename from basis/images/gtk/authors.txt rename to basis/images/loader/gtk/authors.txt diff --git a/basis/images/gtk/gtk.factor b/basis/images/loader/gtk/gtk.factor similarity index 99% rename from basis/images/gtk/gtk.factor rename to basis/images/loader/gtk/gtk.factor index 95b677b3c2..c395bca5ab 100644 --- a/basis/images/gtk/gtk.factor +++ b/basis/images/loader/gtk/gtk.factor @@ -5,7 +5,7 @@ destructors gdk.pixbuf.ffi gobject.ffi grouping images images.loader io kernel locals math sequences specialized-arrays ; FROM: system => os linux freebsd netbsd openbsd ; -IN: images.gtk +IN: images.loader.gtk SPECIALIZED-ARRAY: uchar SINGLETON: gtk-image diff --git a/basis/images/gtk/platforms.txt b/basis/images/loader/gtk/platforms.txt similarity index 100% rename from basis/images/gtk/platforms.txt rename to basis/images/loader/gtk/platforms.txt diff --git a/basis/images/gtk/summary.txt b/basis/images/loader/gtk/summary.txt similarity index 100% rename from basis/images/gtk/summary.txt rename to basis/images/loader/gtk/summary.txt diff --git a/basis/ui/images/images.factor b/basis/ui/images/images.factor index 74a7be2bb1..4a23f1c526 100644 --- a/basis/ui/images/images.factor +++ b/basis/ui/images/images.factor @@ -33,8 +33,8 @@ PRIVATE> << { - { [ os macosx? ] [ "images.cocoa" require ] } - { [ os windows? ] [ "images.gdiplus" require ] } - [ "images.gtk" require ] + { [ os macosx? ] [ "images.loader.cocoa" require ] } + { [ os windows? ] [ "images.loader.gdiplus" require ] } + [ "images.loader.gtk" require ] } cond >>