Fix up LZ77 compression code and prepare v1.0.3

[wimlib] / src / lzx-decomp.c

diff --git a/src/lzx-decomp.c b/src/lzx-decomp.c
index 2996afa2b77fed83300f5afffa7c69d413199c60..d598d941c1d49bb0c2fef2c6c4b44ba26de4636f 100644 (file)
--- a/src/lzx-decomp.c
+++ b/src/lzx-decomp.c
@@ -450,7 +450,7 @@ static int lzx_read_block_header(struct input_bitstream *istream,
                ret = bitstream_read_bytes(istream, sizeof(R), R);
                if (ret != 0)
                        return ret;
                ret = bitstream_read_bytes(istream, sizeof(R), R);
                if (ret != 0)
                        return ret;

-               array_to_le32(R, ARRAY_LEN(3));
+               array_to_le32(R, ARRAY_LEN(R));

                queue->R0 = R[0];
                queue->R1 = R[1];
                queue->R2 = R[2];
                queue->R0 = R[0];
                queue->R1 = R[1];
                queue->R2 = R[2];


@@ -626,8 +626,21 @@ static int lzx_decode_match(int main_element, int block_type,
                return -1;
        }
 
                return -1;
        }
 

+#if 0
+       printf("Match: src %u, dst %u, len %u\n", match_src - window,
+                                               match_dest - window,
+                                               match_len);
+       putchar('|');
+       for (i = 0; i < match_len; i++) {
+               match_dest[i] = match_src[i];
+               putchar(match_src[i]);
+       }
+       putchar('|');
+       putchar('\n');
+#else

        for (i = 0; i < match_len; i++)
                match_dest[i] = match_src[i];
        for (i = 0; i < match_len; i++)
                match_dest[i] = match_src[i];

+#endif

 
        return match_len;
 }
 
        return match_len;
 }