steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix bitmap rendering

db4
Doug Coleman 2009-03-14 15:31:59 -05:00
parent aa91df6b10
commit 935849b418
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
basis/images/bitmap/bitmap.factor
View File

@ -11,6 +11,8 @@ IN: images.bitmap
: read2 ( -- n ) 2 read le> ; : read2 ( -- n ) 2 read le> ;
: read4 ( -- n ) 4 read le> ; : read4 ( -- n ) 4 read le> ;
: write2 ( n -- ) 2 >le write ;
: write4 ( n -- ) 4 >le write ;
TUPLE: bitmap-image < image ; TUPLE: bitmap-image < image ;
@ -34,22 +36,25 @@ M: bitmap-magic summary
ERROR: bmp-not-supported n ; ERROR: bmp-not-supported n ;
: raw-bitmap>seq ( bitmap -- array ) : reverse-lines ( byte-array width -- byte-array )
3 * <sliced-groups> <reversed> concat ; inline
: raw-bitmap>seq ( loading-bitmap -- array )
dup bit-count>> dup bit-count>>
{ {
{ 32 [ color-index>> ] } { 32 [ color-index>> ] }
{ 24 [ color-index>> ] } { 24 [ [ color-index>> ] [ width>> ] bi reverse-lines ] }
{ 8 [ 8bit>buffer ] } { 8 [ [ 8bit>buffer ] [ width>> ] bi reverse-lines ] }
[ bmp-not-supported ] [ bmp-not-supported ]
} case >byte-array ; } case >byte-array ;
: parse-file-header ( bitmap -- bitmap ) : parse-file-header ( loading-bitmap -- loading-bitmap )
2 read "BM" assert-sequence= 2 read "BM" assert-sequence=
read4 >>size read4 >>size
read4 >>reserved read4 >>reserved
read4 >>offset ; read4 >>offset ;
: parse-bitmap-header ( bitmap -- bitmap ) : parse-bitmap-header ( loading-bitmap -- loading-bitmap )
read4 >>header-length read4 >>header-length
read4 >>width read4 >>width
read4 >>height read4 >>height
@ -84,7 +89,7 @@ ERROR: bmp-not-supported n ;
ERROR: unknown-component-order bitmap ; ERROR: unknown-component-order bitmap ;
: bitmap>component-order ( bitmap -- object ) : bitmap>component-order ( loading-bitmap -- object )
bit-count>> { bit-count>> {
{ 32 [ BGRA ] } { 32 [ BGRA ] }
{ 24 [ BGR ] } { 24 [ BGR ] }
@ -102,10 +107,8 @@ ERROR: unknown-component-order bitmap ;
M: bitmap-image load-image* ( path loading-bitmap -- bitmap ) M: bitmap-image load-image* ( path loading-bitmap -- bitmap )
drop loading-bitmap new drop loading-bitmap new
load-bitmap-data loading-bitmap>bitmap-image ; load-bitmap-data
loading-bitmap>bitmap-image ;
: write2 ( n -- ) 2 >le write ;
: write4 ( n -- ) 4 >le write ;
PRIVATE> PRIVATE>
@ -150,7 +153,10 @@ PRIVATE>
[ drop 0 write4 ] [ drop 0 write4 ]
! rgb-quads ! rgb-quads
[ bitmap>> bitmap>color-index write ] [
[ bitmap>> bitmap>color-index ] [ dim>> first ] bi
reverse-lines write
]
} cleave } cleave
] bi ] bi
] with-file-writer ; ] with-file-writer ;