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

diff --git a/extra/images/backend/backend.factor b/extra/images/backend/backend.factor
index 2e626b73e6e4fde250330a14467723ccbf1695ac..6d73a253aeca1b6fd6c02a50be34a25de931bf91 100644 (file)
--- a/extra/images/backend/backend.factor
+++ b/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 ;

diff --git a/extra/images/bitmap/bitmap.factor b/extra/images/bitmap/bitmap.factor
index 7b59827d028688f570f3be120efdd1e639cf6700..46f90e33f860a8482966065fccd225e79895a3b9 100755 (executable)
--- a/extra/images/bitmap/bitmap.factor
+++ b/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