generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

REVERT OF: Update libjpeg to release 8d (reverse-merged from commit d28af08ef3)

Browse Source
This commit is contained in:
Andrey Pavlenko
2012-09-26 14:02:23 +04:00
parent 4e193a3380
commit 56200dbd37
58 changed files with 5629 additions and 15833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
3rdparty/libjpeg/jcinit.c vendored
View File

@@ -41,10 +41,17 @@ jinit_compress_master (j_compress_ptr cinfo)
/* Forward DCT */
jinit_forward_dct(cinfo);
/* Entropy encoding: either Huffman or arithmetic coding. */
if (cinfo->arith_code)
jinit_arith_encoder(cinfo);
else {
jinit_huff_encoder(cinfo);
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);
}
/* Need a full-image coefficient buffer in any multi-pass mode. */