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

Revert type change

Browse Source 
Revert type of use_moz_defaults to boolean
This commit is contained in:
Frank Bossen
2014-04-30 14:54:18 -04:00
parent 101df25fde
commit c88aade31c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jcparam.c
View File

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

2
jpeglib.h
View File

@@ -376,7 +376,7 @@ struct jpeg_compress_struct {
int smoothing_factor; /* 1..100, or 0 for no input smoothing */ int smoothing_factor; /* 1..100, or 0 for no input smoothing */
J_DCT_METHOD dct_method; /* DCT algorithm selector */ J_DCT_METHOD dct_method; /* DCT algorithm selector */
int use_moz_defaults; /* nonzero if using Mozilla defaults, 1=crush, 2=trellis */ boolean use_moz_defaults; /* nonzero if using Mozilla defaults, 1=crush, 2=trellis */
boolean optimize_scans; /* TRUE=optimize progressive coding scans */ boolean optimize_scans; /* TRUE=optimize progressive coding scans */
boolean trellis_quant; /* TRUE=use trellis quantization */ boolean trellis_quant; /* TRUE=use trellis quantization */
boolean trellis_eob_opt; /* TRUE=optimize for sequences of EOB */ boolean trellis_eob_opt; /* TRUE=optimize for sequences of EOB */