Merge branch 'master' of git://factorcode.org/git/factor into new_ui

extra/images/backend/backend.factor

@@ -40,11 +40,6 @@ GENERIC: >image ( object -- image )
 GENERIC: normalize-scan-line-order ( image -- image )
 
 M: image normalize-scan-line-order ;
-M: bitmap-image normalize-scan-line-order
-    dup dim>> '[
-        _ first 4 * <sliced-groups> reverse concat
-    ] change-bitmap ;
-    
 : normalize-image ( image -- image )
     normalize-component-order
     normalize-scan-line-order ;

extra/images/bitmap/bitmap.factor

@@ -112,6 +112,11 @@ M: bitmap >image ( bitmap -- bitmap-image )
 M: bitmap-image load-image* ( path bitmap -- bitmap-image )
     drop load-bitmap >image ;
 
+M: bitmap-image normalize-scan-line-order
+    dup dim>> '[
+        _ first 4 * <sliced-groups> reverse concat
+    ] change-bitmap ;
+
 MACRO: (nbits>bitmap) ( bits -- )
     [ -3 shift ] keep '[
         bitmap new