From 451a13c740d3cf82f881b78a8937c13563b783ed Mon Sep 17 00:00:00 2001
From: Doug Coleman <erg@jobim.local>
Date: Fri, 15 May 2009 01:27:00 -0500
Subject: [PATCH] oops, i was using alt.bitstreams in some places
---
basis/compression/huffman/huffman.factor | 4 ++--
basis/compression/inflate/inflate.factor | 4 ++--
basis/images/jpeg/jpeg.factor | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/basis/compression/huffman/huffman.factor b/basis/compression/huffman/huffman.factor
index 60b3a1d5a1..6ef9c2fabc 100755
--- a/basis/compression/huffman/huffman.factor
+++ b/basis/compression/huffman/huffman.factor
@@ -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
diff --git a/basis/compression/inflate/inflate.factor b/basis/compression/inflate/inflate.factor
index a828718f75..3e67b11cc7 100755
--- 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 ;
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 ;
diff --git a/basis/images/jpeg/jpeg.factor b/basis/images/jpeg/jpeg.factor
index 0588e5c365..648923704a 100755
--- 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 ;
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