diff --git a/extra/images/backend/backend.factor b/extra/images/backend/backend.factor index 2e626b73e6..6d73a253ae 100644 --- 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 * 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 7b59827d02..46f90e33f8 100755 --- 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 * reverse concat + ] change-bitmap ; + MACRO: (nbits>bitmap) ( bits -- ) [ -3 shift ] keep '[ bitmap new