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

minor cleanups in compression.inflate

db4
Doug Coleman 2009-09-26 19:16:23 -05:00
parent 71952f702a
commit 16cf080393
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
basis/compression/inflate/inflate.factor
View File

@ -190,14 +190,12 @@ CONSTANT: dist-table
curr :> a curr :> a
curr 3 tail-slice :> x curr 3 tail-slice :> x
x length [0,b) x length [0,b)
filter filter {
{
{ 0 [ drop ] } { 0 [ drop ] }
{ 1 [ [| n | n x nth n a nth + 256 wrap n x set-nth ] each ] } { 1 [ [| n | n x nth n a nth + 256 wrap n x set-nth ] each ] }
{ 2 [ [| n | n x nth n b nth + 256 wrap n x set-nth ] each ] } { 2 [ [| n | n x nth n b nth + 256 wrap n x set-nth ] each ] }
{ 3 [ [| n | n x nth n a nth n b nth + 2/ + 256 wrap n x set-nth ] each ] } { 3 [ [| n | n x nth n a nth n b nth + 2/ + 256 wrap n x set-nth ] each ] }
{ 4 [ [| n | n x nth n a nth n b nth n c nth paeth + 256 wrap n x set-nth ] each ] } { 4 [ [| n | n x nth n a nth n b nth n c nth paeth + 256 wrap n x set-nth ] each ] }
} case } case
curr 3 tail ; curr 3 tail ;
@ -208,10 +206,11 @@ PRIVATE>
concat [ 128 + ] B{ } map-as ; concat [ 128 + ] B{ } map-as ;
: reverse-png-filter ( lines -- byte-array ) : reverse-png-filter ( lines -- byte-array )
dup first [ 0 ] replicate prefix dup first length 0 <array> prefix
[ { 0 0 } prepend ] map [ { 0 0 } prepend ] map
2 clump [ 2 clump [
first2 dup [ third ] [ 0 2 rot set-nth ] bi png-unfilter-line first2 dup [ third ] [ [ 0 2 ] dip set-nth ] bi
png-unfilter-line
] map B{ } concat-as ; ] map B{ } concat-as ;
: zlib-inflate ( bytes -- bytes ) : zlib-inflate ( bytes -- bytes )