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

oops, i was using alt.bitstreams in some places

db4
Doug Coleman 2009-05-15 01:27:00 -05:00
parent 312fe46848
commit 451a13c740
3 changed files with 6 additions and 6 deletions
basis
compression
images/jpeg

4
basis/compression/huffman/huffman.factor
View File

@ -1,11 +1,11 @@
! Copyright (C) 2009 Marc Fauconneau.
! See http://factorcode.org/license.txt for BSD license.
USING: accessors alt.bitstreams arrays assocs constructors fry
USING: accessors arrays assocs constructors fry
hashtables io kernel locals math math.order math.parser
math.ranges multiline sequences ;
IN: compression.huffman
QUALIFIED-WITH: alt.bitstreams bs
QUALIFIED-WITH: bitstreams bs
<PRIVATE

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

@ -7,7 +7,7 @@ math math.bitwise math.order math.ranges multiline sequences
sorting ;
IN: compression.inflate
QUALIFIED-WITH: alt.bitstreams bs
QUALIFIED-WITH: bitstreams bs
<PRIVATE
@ -203,7 +203,7 @@ PRIVATE>
2 clump [ first2 dup [ third ] [ 0 2 rot set-nth ] bi png-unfilter-line ] map concat ;
: zlib-inflate ( bytes -- bytes )
bs:<lsb0-bitstream>
bs:<lsb0-bit-reader>
[ check-zlib-header ]
[ inflate-loop ] bi
inflate-lz77 ;

4
basis/images/jpeg/jpeg.factor
View File

@ -9,7 +9,7 @@ math.ranges math.vectors memoize multiline namespaces
sequences sequences.deep ;
IN: images.jpeg
QUALIFIED-WITH: alt.bitstreams bs
QUALIFIED-WITH: bitstreams bs
TUPLE: jpeg-image < image
{ headers }
@ -274,7 +274,7 @@ MEMO: dct-matrix-blas ( -- m ) dct-matrix >float-blas-matrix ;
: baseline-decompress ( -- )
jpeg> bitstream>> cleanup-bitstream { 255 255 255 255 } append
>byte-array bs:<msb0-bitstream> jpeg> (>>bitstream)
>byte-array bs:<msb0-bit-reader> jpeg> (>>bitstream)
jpeg> [ bitstream>> ] [ [ [ <huffman-decoder> ] with map ] change-huff-tables drop ] bi
jpeg> components>> [ fetch-tables ] each
jpeg> setup-bitmap