summaryrefslogtreecommitdiff
path: root/src/libjpeg/jdtrans.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libjpeg/jdtrans.c')
-rw-r--r--src/libjpeg/jdtrans.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/libjpeg/jdtrans.c b/src/libjpeg/jdtrans.c
index 6c0ab71..385c336 100644
--- a/src/libjpeg/jdtrans.c
+++ b/src/libjpeg/jdtrans.c
@@ -100,17 +100,10 @@ transdecode_master_selection (j_decompress_ptr cinfo)
cinfo->buffered_image = TRUE;
/* Entropy decoding: either Huffman or arithmetic coding. */
- if (cinfo->arith_code) {
- ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
- } else {
- if (cinfo->progressive_mode) {
-#ifdef D_PROGRESSIVE_SUPPORTED
- jinit_phuff_decoder(cinfo);
-#else
- ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
- } else
- jinit_huff_decoder(cinfo);
+ if (cinfo->arith_code)
+ jinit_arith_decoder(cinfo);
+ else {
+ jinit_huff_decoder(cinfo);
}
/* Always get a full-image coefficient buffer. */