clean up some image code

diff --git a/extra/images/backend/backend.factor b/extra/images/backend/backend.factor
index 796e9a3a664df348f90518778a33e9f949402eac..2e626b73e6e4fde250330a14467723ccbf1695ac 100644 (file)
--- a/extra/images/backend/backend.factor
+++ b/extra/images/backend/backend.factor
@@ -5,7 +5,6 @@ images.bitmap math ;
 IN: images.backend
 
 SINGLETONS: BGR RGB BGRA RGBA ABGR ARGB RGBX XRGB BGRX XBGR ;
-! RGBA
 
 TUPLE: image dim component-order bitmap ;
 
@@ -42,9 +41,9 @@ GENERIC: normalize-scan-line-order ( image -- image )
 
 M: image normalize-scan-line-order ;
 M: bitmap-image normalize-scan-line-order
-    dup
-    [ bitmap>> ] [ dim>> first 4 * ] bi <sliced-groups> reverse concat
-    >>bitmap ;
+    dup dim>> '[
+        _ first 4 * <sliced-groups> reverse concat
+    ] change-bitmap ;
     
 : normalize-image ( image -- image )
     normalize-component-order

diff --git a/extra/images/viewer/viewer.factor b/extra/images/viewer/viewer.factor
index f99c34f50982e799c37392990a9c01cc144df4bc..92277dfdefc7c64ab726fadb5876bbd865e106d4 100644 (file)
--- a/extra/images/viewer/viewer.factor
+++ b/extra/images/viewer/viewer.factor
@@ -25,10 +25,13 @@ M: image-gadget draw-gadget* ( gadget -- )
 : image-window ( path -- gadget )
     [ <image> <image-gadget> dup ] [ open-window ] bi ;
 
-GENERIC: image. ( image -- )
+GENERIC: image. ( object -- )
 
-M: string image. ( image -- ) <image> <image-gadget> gadget. ;
+: default-image. ( path -- )
+    <image-gadget> gadget. ;
 
-M: pathname image. ( image -- ) <image> <image-gadget> gadget. ;
+M: string image. ( image -- ) <image> default-image. ;
 
-M: image image. ( image -- ) <image-gadget> gadget. ;
+M: pathname image. ( image -- ) <image> default-image. ;
+
+M: image image. ( image -- ) default-image. ;