From 31754cb070e3fe02fa44ea2ae0599f9ed39de82d Mon Sep 17 00:00:00 2001 From: Lin Huang Date: Fri, 17 Feb 2012 02:22:36 -0800 Subject: [PATCH] minor change in huffman_decoding --- compress.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/compress.cpp b/compress.cpp index 03857d7..aeb7782 100644 --- a/compress.cpp +++ b/compress.cpp @@ -138,7 +138,6 @@ vector DATCompression::identity_decompress(vector compressed) { vector DATCompression::compression(vector data) { vector compressed; - int max_data, min_data; compressed = diff_compress(data); compressed = huffman_compress(compressed); @@ -346,7 +345,7 @@ vector DATCompression::huffman_decompress(vector compressed) } else if(status == 't') { - if(i == compressed.size() - 2 && 8 - i == useless_bits) + if(i == compressed.size() - 2 && 8 - j == useless_bits) break; if((number & 0x80) == 0x80) @@ -1034,10 +1033,10 @@ int main() { // test_compression_on_file("data/test.tab"); - test_compression_on_file("data/B28-39_100_100_acq_0007.tab"); + //test_compression_on_file("data/B28-39_100_100_acq_0007.tab"); //test_compression_on_file("data/B28-39_100_100_acq_0400.tab"); //test_compression_on_file("data/B28-39_1600_1000_acq_0007.tab"); - //test_compression_on_file("data/B28-39_1600_1000_acq_0400.tab"); + test_compression_on_file("data/B28-39_1600_1000_acq_0400.tab"); return 0; }