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

Merge branch 'png' of git://github.com/klazuka/factor

db4
Doug Coleman 2009-09-28 14:29:00 -05:00
parent 438e848356 f45a6df8e5
commit bf2cfd0aa6
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
basis/images/png/png.factor
View File

@ -125,23 +125,23 @@ ERROR: unimplemented-color-type image ;
: png-image-bytes ( loading-png -- byte-array ) : png-image-bytes ( loading-png -- byte-array )
[ png-bytes-per-pixel ] [ inflate-data ] [ png-group-width ] tri group reverse-png-filter ; [ png-bytes-per-pixel ] [ inflate-data ] [ png-group-width ] tri group reverse-png-filter ;
: decode-greyscale ( loading-png -- loading-png ) : decode-greyscale ( loading-png -- image )
unimplemented-color-type ; unimplemented-color-type ;
: decode-truecolor ( loading-png -- loading-png ) : decode-truecolor ( loading-png -- image )
[ <image> ] dip { [ <image> ] dip {
[ png-image-bytes >>bitmap ] [ png-image-bytes >>bitmap ]
[ [ width>> ] [ height>> ] bi 2array >>dim ] [ [ width>> ] [ height>> ] bi 2array >>dim ]
[ drop RGB >>component-order ubyte-components >>component-type ] [ drop RGB >>component-order ubyte-components >>component-type ]
} cleave ; } cleave ;
: decode-indexed-color ( loading-png -- loading-png ) : decode-indexed-color ( loading-png -- image )
unimplemented-color-type ; unimplemented-color-type ;
: decode-greyscale-alpha ( loading-png -- loading-png ) : decode-greyscale-alpha ( loading-png -- image )
unimplemented-color-type ; unimplemented-color-type ;
: decode-truecolor-alpha ( loading-png -- loading-png ) : decode-truecolor-alpha ( loading-png -- image )
[ <image> ] dip { [ <image> ] dip {
[ png-image-bytes >>bitmap ] [ png-image-bytes >>bitmap ]
[ [ width>> ] [ height>> ] bi 2array >>dim ] [ [ width>> ] [ height>> ] bi 2array >>dim ]
@ -169,7 +169,7 @@ ERROR: invalid-color-type/bit-depth loading-png ;
: validate-truecolor-alpha ( loading-png -- loading-png ) : validate-truecolor-alpha ( loading-png -- loading-png )
{ 8 16 } validate-bit-depth ; { 8 16 } validate-bit-depth ;
: decode-png ( loading-png -- loading-png ) : png>image ( loading-png -- image )
dup color-type>> { dup color-type>> {
{ greyscale [ validate-greyscale decode-greyscale ] } { greyscale [ validate-greyscale decode-greyscale ] }
{ truecolor [ validate-truecolor decode-truecolor ] } { truecolor [ validate-truecolor decode-truecolor ] }
@ -179,11 +179,13 @@ ERROR: invalid-color-type/bit-depth loading-png ;
[ unknown-color-type ] [ unknown-color-type ]
} case ; } case ;
M: png-image stream>image : load-png ( stream -- loading-png )
drop [ [
<loading-png> <loading-png>
read-png-header read-png-header
read-png-chunks read-png-chunks
parse-ihdr-chunk parse-ihdr-chunk
decode-png
] with-input-stream ; ] with-input-stream ;
M: png-image stream>image
drop load-png png>image ;