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

db4
John Benediktsson 2011-09-24 19:19:34 -07:00
parent e49c3d17b5
commit 849674f847
3 changed files with 36 additions and 24 deletions

View File

@ -4,17 +4,21 @@ USING: accessors alien.data cocoa cocoa.classes cocoa.messages
combinators core-foundation.data core-graphics combinators core-foundation.data core-graphics
core-graphics.types fry locals images images.loader io kernel core-graphics.types fry locals images images.loader io kernel
math sequences ; math sequences ;
FROM: system => os macosx? ;
IN: images.cocoa IN: images.cocoa
SINGLETON: ns-image SINGLETON: ns-image
"png" ns-image register-image-class
"tif" ns-image register-image-class os macosx? [
"tiff" ns-image register-image-class "png" ns-image register-image-class
"gif" ns-image register-image-class "tif" ns-image register-image-class
"jpg" ns-image register-image-class "tiff" ns-image register-image-class
"jpeg" ns-image register-image-class "gif" ns-image register-image-class
"bmp" ns-image register-image-class "jpg" ns-image register-image-class
"ico" 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: NSImageRepLoadStatusUnknownType -1
CONSTANT: NSImageRepLoadStatusReadingHeader -2 CONSTANT: NSImageRepLoadStatusReadingHeader -2

View File

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

View File

@ -4,18 +4,22 @@ USING: accessors alien.c-types alien.data arrays combinators
destructors gdk.pixbuf.ffi gobject.ffi grouping images destructors gdk.pixbuf.ffi gobject.ffi grouping images
images.loader io kernel locals math sequences images.loader io kernel locals math sequences
specialized-arrays ; specialized-arrays ;
FROM: system => os linux freebsd netbsd openbsd ;
IN: images.gtk IN: images.gtk
SPECIALIZED-ARRAY: uchar SPECIALIZED-ARRAY: uchar
SINGLETON: gtk-image SINGLETON: gtk-image
"png" gtk-image register-image-class
"tif" gtk-image register-image-class os { linux freebsd netbsd openbsd } member? [
"tiff" gtk-image register-image-class "png" gtk-image register-image-class
"gif" gtk-image register-image-class "tif" gtk-image register-image-class
"jpg" gtk-image register-image-class "tiff" gtk-image register-image-class
"jpeg" gtk-image register-image-class "gif" gtk-image register-image-class
"bmp" gtk-image register-image-class "jpg" gtk-image register-image-class
"ico" 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 <PRIVATE