summaryrefslogtreecommitdiff
path: root/src/libjpeg/jctrans.c
diff options
context:
space:
mode:
authorscuri <scuri>2009-08-20 01:10:27 +0000
committerscuri <scuri>2009-08-20 01:10:27 +0000
commit83b3c8b629d96f5fdf754d35d5f4f5369dbfef1d (patch)
tree81242227fb731da262139283c301e58f861e9727 /src/libjpeg/jctrans.c
parentb014c9fa4544c111796aed1406e704338bacf456 (diff)
*** empty log message ***
Diffstat (limited to 'src/libjpeg/jctrans.c')
-rw-r--r--src/libjpeg/jctrans.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/libjpeg/jctrans.c b/src/libjpeg/jctrans.c
index 0e6d707..74bb12c 100644
--- a/src/libjpeg/jctrans.c
+++ b/src/libjpeg/jctrans.c
@@ -167,16 +167,9 @@ transencode_master_selection (j_compress_ptr cinfo,
/* Entropy encoding: either Huffman or arithmetic coding. */
if (cinfo->arith_code) {
- ERREXIT(cinfo, JERR_ARITH_NOTIMPL);
+ jinit_arith_encoder(cinfo);
} else {
- if (cinfo->progressive_mode) {
-#ifdef C_PROGRESSIVE_SUPPORTED
- jinit_phuff_encoder(cinfo);
-#else
- ERREXIT(cinfo, JERR_NOT_COMPILED);
-#endif
- } else
- jinit_huff_encoder(cinfo);
+ jinit_huff_encoder(cinfo);
}
/* We need a special coefficient buffer controller. */