 
 : loading-bitmap>bitmap-image ( bitmap-image loading-bitmap -- bitmap-image )
     {
-        [ raw-bitmap>seq >>bitmap ]
+        [ loading-bitmap>bytes >>bitmap ]
         [ [ width>> ] [ height>> abs ] bi 2array >>dim ]
         [ height>> 0 < [ t >>upside-down? ] when ]
         [ bitmap>component-order >>component-order ]
     } cleave ;
 
 M: bitmap-image load-image* ( path loading-bitmap -- bitmap )
-    swap load-bitmap-data loading-bitmap>bitmap-image ;
+    swap load-bitmap loading-bitmap>bitmap-image ;
 
 "bmp" bitmap-image register-image-class
 

        { 8 [ [ 8bit>buffer ] [ width>> 3 * ] bi reverse-lines ] }
        [ bmp-not-supported ]
    } case >byte-array ;

: parse-file-header ( loading-bitmap -- loading-bitmap )
    2 read "BM" assert-sequence=

    ] when ;

: parse-bitmap ( loading-bitmap -- loading-bitmap )
    dup color-palette-length read >>color-palette
    dup color-index-length read >>color-index
    fixup-color-index ;

: load-bitmap ( path -- loading-bitmap )
    binary [
        loading-bitmap new
        parse-file-header parse-bitmap-header parse-bitmap
