diff -r b72c6db6890b -r 5dc02b23752f src/3rdparty/libjpeg/jcinit.c --- a/src/3rdparty/libjpeg/jcinit.c Wed Jun 23 19:07:03 2010 +0300 +++ b/src/3rdparty/libjpeg/jcinit.c Tue Jul 06 15:10:48 2010 +0300 @@ -41,17 +41,10 @@ /* Forward DCT */ jinit_forward_dct(cinfo); /* Entropy encoding: either Huffman or arithmetic coding. */ - if (cinfo->arith_code) { - ERREXIT(cinfo, JERR_ARITH_NOTIMPL); - } 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); + if (cinfo->arith_code) + jinit_arith_encoder(cinfo); + else { + jinit_huff_encoder(cinfo); } /* Need a full-image coefficient buffer in any multi-pass mode. */