From 83b3c8b629d96f5fdf754d35d5f4f5369dbfef1d Mon Sep 17 00:00:00 2001
From: scuri <scuri>
Date: Thu, 20 Aug 2009 01:10:27 +0000
Subject: *** empty log message ***

---
 src/libjpeg/jctrans.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/libjpeg/jctrans.c')

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. */
-- 
cgit v1.2.3