aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2008-06-20 16:19:54 +0300
committerLasse Collin <lasse.collin@tukaani.org>2008-06-20 16:19:54 +0300
commiteaafc4367c77ec1d910e16d11b4da293969d97a3 (patch)
tree6cae059120df08e16aad0b54f350ac776fea6f97
parentAdd limit of lc + lp <= 4. Now we can allocate the (diff)
downloadxz-eaafc4367c77ec1d910e16d11b4da293969d97a3.tar.xz
Remove some redundant code from LZMA encoder.
-rw-r--r--src/liblzma/lzma/lzma_encoder.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/src/liblzma/lzma/lzma_encoder.c b/src/liblzma/lzma/lzma_encoder.c
index e9de32c8..afb1d5ed 100644
--- a/src/liblzma/lzma/lzma_encoder.c
+++ b/src/liblzma/lzma/lzma_encoder.c
@@ -27,19 +27,6 @@
/////////////
static inline void
-literal_normal(lzma_range_encoder *rc, probability *subcoder, uint32_t symbol)
-{
- uint32_t context = 1;
- uint32_t bit_count = 8; // Bits per byte
- do {
- const uint32_t bit = (symbol >> --bit_count) & 1;
- rc_bit(rc, &subcoder[context], bit);
- context = (context << 1) | bit;
- } while (bit_count != 0);
-}
-
-
-static inline void
literal_matched(lzma_range_encoder *rc, probability *subcoder,
uint32_t match_byte, uint32_t symbol)
{
@@ -81,7 +68,7 @@ literal(lzma_coder *coder)
if (is_literal_state(coder->state)) {
// Previous LZMA-symbol was a literal. Encode a normal
// literal without a match byte.
- literal_normal(&coder->rc, subcoder, cur_byte);
+ rc_bittree(&coder->rc, subcoder, 8, cur_byte);
} else {
// Previous LZMA-symbol was a match. Use the last byte of
// the match as a "match byte". That is, compare the bits