images: only register with the images.loader on proper platform. Fixes #172. Fixes...

diff --git a/basis/images/cocoa/cocoa.factor b/basis/images/cocoa/cocoa.factor
index a308d3f47531c7a74080420a5711cc9199f6aae2..b2e14ddd660e33730d9327e4134456555e282cbe 100644 (file)
--- a/basis/images/cocoa/cocoa.factor
+++ b/basis/images/cocoa/cocoa.factor
@@ -4,17 +4,21 @@ USING: accessors alien.data cocoa cocoa.classes cocoa.messages
 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
 
 SINGLETON: ns-image
-"png" ns-image register-image-class
-"tif" ns-image register-image-class
-"tiff" ns-image register-image-class
-"gif" ns-image register-image-class
-"jpg" ns-image register-image-class
-"jpeg" ns-image register-image-class
-"bmp" ns-image register-image-class
-"ico" ns-image register-image-class
+
+os macosx? [
+    "png" ns-image register-image-class
+    "tif" ns-image register-image-class
+    "tiff" ns-image register-image-class
+    "gif" ns-image register-image-class
+    "jpg" ns-image register-image-class
+    "jpeg" ns-image register-image-class
+    "bmp" ns-image register-image-class
+    "ico" ns-image register-image-class
+] when
 
 CONSTANT: NSImageRepLoadStatusUnknownType     -1
 CONSTANT: NSImageRepLoadStatusReadingHeader   -2

diff --git a/basis/images/gdiplus/gdiplus.factor b/basis/images/gdiplus/gdiplus.factor
index d97bd5c467bdaae151cca343e638633ecb82aeca..1bdb6526f215f8aadda5243753451099c6102a0f 100644 (file)
--- a/basis/images/gdiplus/gdiplus.factor
+++ b/basis/images/gdiplus/gdiplus.factor
@@ -3,17 +3,21 @@ USING: accessors alien.c-types alien.data alien.enums
 classes.struct destructors images images.loader kernel locals\r
 math windows.com windows.gdiplus windows.streams windows.types\r
 typed byte-arrays grouping sequences ;\r
+FROM: system => os windows? ;\r
 IN: images.gdiplus\r
 \r
 SINGLETON: gdi+-image\r
-"png" gdi+-image register-image-class\r
-"tif" gdi+-image register-image-class\r
-"tiff" gdi+-image register-image-class\r
-"gif" gdi+-image register-image-class\r
-"jpg" gdi+-image register-image-class\r
-"jpeg" gdi+-image register-image-class\r
-"bmp" gdi+-image register-image-class\r
-"ico" gdi+-image register-image-class\r
+\r
+os windows? [\r
+    "png" gdi+-image register-image-class\r
+    "tif" gdi+-image register-image-class\r
+    "tiff" gdi+-image register-image-class\r
+    "gif" gdi+-image register-image-class\r
+    "jpg" gdi+-image register-image-class\r
+    "jpeg" gdi+-image register-image-class\r
+    "bmp" gdi+-image register-image-class\r
+    "ico" gdi+-image register-image-class\r
+] when\r
 \r
 <PRIVATE\r
 : <GpRect> ( x y w h -- rect )\r

diff --git a/basis/images/gtk/gtk.factor b/basis/images/gtk/gtk.factor
index 4957a4d216d2664897d43f5f854fac3464dc176b..05015c2dfcde726cfafba6033529c72633025eb9 100644 (file)
--- a/basis/images/gtk/gtk.factor
+++ b/basis/images/gtk/gtk.factor
@@ -4,18 +4,22 @@ USING: accessors alien.c-types alien.data arrays combinators
 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
 SPECIALIZED-ARRAY: uchar
 
 SINGLETON: gtk-image
-"png"  gtk-image register-image-class
-"tif"  gtk-image register-image-class
-"tiff" gtk-image register-image-class
-"gif"  gtk-image register-image-class
-"jpg"  gtk-image register-image-class
-"jpeg" gtk-image register-image-class
-"bmp"  gtk-image register-image-class
-"ico"  gtk-image register-image-class
+
+os { linux freebsd netbsd openbsd } member? [
+    "png"  gtk-image register-image-class
+    "tif"  gtk-image register-image-class
+    "tiff" gtk-image register-image-class
+    "gif"  gtk-image register-image-class
+    "jpg"  gtk-image register-image-class
+    "jpeg" gtk-image register-image-class
+    "bmp"  gtk-image register-image-class
+    "ico"  gtk-image register-image-class
+] when
 
 <PRIVATE