ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Temp fix for #138

Browse Source 
Disable scan optimization and trellis quantization when arithmetic
coding is used
This commit is contained in:
Frank Bossen
2014-12-20 04:03:14 +01:00
parent 4ac7101056
commit 6c08ceb2ef
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cjpeg.c
View File

@@ -289,6 +289,15 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
/* Use arithmetic coding. */ /* Use arithmetic coding. */
#ifdef C_ARITH_CODING_SUPPORTED #ifdef C_ARITH_CODING_SUPPORTED
cinfo->arith_code = TRUE; cinfo->arith_code = TRUE;
/* No table optimization required for AC */
cinfo->optimize_coding = FALSE;
/* Scan optimization currently incompatible with AC */
jpeg_c_set_bool_param(cinfo, JBOOLEAN_OPTIMIZE_SCANS, FALSE);
/* Trellis quantization currently incompatible with AC */
jpeg_c_set_bool_param(cinfo, JBOOLEAN_TRELLIS_QUANT, FALSE);
#else #else
fprintf(stderr, "%s: sorry, arithmetic coding not supported\n", fprintf(stderr, "%s: sorry, arithmetic coding not supported\n",
progname); progname);

6
jpegtran.c
View File

@@ -175,6 +175,12 @@ parse_switches (j_compress_ptr cinfo, int argc, char **argv,
/* Use arithmetic coding. */ /* Use arithmetic coding. */
#ifdef C_ARITH_CODING_SUPPORTED #ifdef C_ARITH_CODING_SUPPORTED
cinfo->arith_code = TRUE; cinfo->arith_code = TRUE;
/* No table optimization required for AC */
cinfo->optimize_coding = FALSE;
/* Scan optimization currently incompatible with AC */
jpeg_c_set_bool_param(cinfo, JBOOLEAN_OPTIMIZE_SCANS, FALSE);
#else #else
fprintf(stderr, "%s: sorry, arithmetic coding not supported\n", fprintf(stderr, "%s: sorry, arithmetic coding not supported\n",
progname); progname);