Enable combination of trellis quantization and scan optimization

This commit is contained in:
Frank Bossen
2014-03-28 12:42:37 +01:00
parent 2de8e97989
commit 199fffb759
2 changed files with 20 additions and 15 deletions

View File

@@ -419,14 +419,14 @@ jpeg_set_defaults (j_compress_ptr cinfo)
jpeg_default_colorspace(cinfo);
#ifdef C_PROGRESSIVE_SUPPORTED
if (cinfo->use_moz_defaults == 1) { // Disable this while working on trellis
if (cinfo->use_moz_defaults != 0) { // Disable this while working on trellis
cinfo->optimize_scans = TRUE;
jpeg_simple_progression(cinfo);
} else
cinfo->optimize_scans = FALSE;
#endif
cinfo->trellis_quant = (cinfo->use_moz_defaults == 2) ? TRUE : FALSE;
cinfo->trellis_quant = (cinfo->use_moz_defaults != 0) ? TRUE : FALSE;
cinfo->lambda_log_scale1 = 17.0;
cinfo->lambda_log_scale2 = 15.0;
}