oops, i was using alt.bitstreams in some places

diff --git a/basis/compression/huffman/huffman.factor b/basis/compression/huffman/huffman.factor
index 60b3a1d5a1b353d8ab5f304a305a776ceb39325d..6ef9c2fabcd698a539e72c8ab6cc5540cc20f831 100755 (executable)
--- a/basis/compression/huffman/huffman.factor
+++ b/basis/compression/huffman/huffman.factor
@@ -1,11 +1,11 @@
 ! Copyright (C) 2009 Marc Fauconneau.\r
 ! See http://factorcode.org/license.txt for BSD license.\r
-USING: accessors alt.bitstreams arrays assocs constructors fry\r
+USING: accessors arrays assocs constructors fry\r
 hashtables io kernel locals math math.order math.parser\r
 math.ranges multiline sequences ;\r
 IN: compression.huffman\r
 \r
-QUALIFIED-WITH: alt.bitstreams bs\r
+QUALIFIED-WITH: bitstreams bs\r
 \r
 <PRIVATE\r
 \r

diff --git a/basis/compression/inflate/inflate.factor b/basis/compression/inflate/inflate.factor
index a828718f756b328883b0fd61677beeab9055d910..3e67b11cc724778033db24ba7341a20fe7f5169a 100755 (executable)
--- a/basis/compression/inflate/inflate.factor
+++ b/basis/compression/inflate/inflate.factor
@@ -7,7 +7,7 @@ math math.bitwise math.order math.ranges multiline sequences
 sorting ;\r
 IN: compression.inflate\r
 \r
-QUALIFIED-WITH: alt.bitstreams bs\r
+QUALIFIED-WITH: bitstreams bs\r
 \r
 <PRIVATE\r
 \r
@@ -203,7 +203,7 @@ PRIVATE>
     2 clump [ first2 dup [ third ] [ 0 2 rot set-nth ] bi png-unfilter-line ] map concat ;\r
 \r
 : zlib-inflate ( bytes -- bytes )\r
-    bs:<lsb0-bitstream>\r
+    bs:<lsb0-bit-reader>\r
     [ check-zlib-header ]\r
     [ inflate-loop ] bi\r
     inflate-lz77 ;\r

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