Merge branch 'master' into dev
This commit is contained in:
12
rdswitch.c
12
rdswitch.c
@@ -338,8 +338,8 @@ set_quality_ratings(j_compress_ptr cinfo, char *arg, boolean force_baseline)
|
|||||||
#else
|
#else
|
||||||
q_scale_factor[tblno] = jpeg_quality_scaling(val);
|
q_scale_factor[tblno] = jpeg_quality_scaling(val);
|
||||||
#endif
|
#endif
|
||||||
while (*arg && *arg++ != ',') /* advance to next segment of arg string */
|
while (*arg && *arg++ != ','); /* advance to next segment of arg
|
||||||
;
|
string */
|
||||||
} else {
|
} else {
|
||||||
/* reached end of parameter, set remaining factors to last value */
|
/* reached end of parameter, set remaining factors to last value */
|
||||||
#if JPEG_LIB_VERSION >= 70
|
#if JPEG_LIB_VERSION >= 70
|
||||||
@@ -378,8 +378,8 @@ set_quant_slots(j_compress_ptr cinfo, char *arg)
|
|||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
cinfo->comp_info[ci].quant_tbl_no = val;
|
cinfo->comp_info[ci].quant_tbl_no = val;
|
||||||
while (*arg && *arg++ != ',') /* advance to next segment of arg string */
|
while (*arg && *arg++ != ','); /* advance to next segment of arg
|
||||||
;
|
string */
|
||||||
} else {
|
} else {
|
||||||
/* reached end of parameter, set remaining components to last table */
|
/* reached end of parameter, set remaining components to last table */
|
||||||
cinfo->comp_info[ci].quant_tbl_no = val;
|
cinfo->comp_info[ci].quant_tbl_no = val;
|
||||||
@@ -412,8 +412,8 @@ set_sample_factors(j_compress_ptr cinfo, char *arg)
|
|||||||
}
|
}
|
||||||
cinfo->comp_info[ci].h_samp_factor = val1;
|
cinfo->comp_info[ci].h_samp_factor = val1;
|
||||||
cinfo->comp_info[ci].v_samp_factor = val2;
|
cinfo->comp_info[ci].v_samp_factor = val2;
|
||||||
while (*arg && *arg++ != ',') /* advance to next segment of arg string */
|
while (*arg && *arg++ != ','); /* advance to next segment of arg
|
||||||
;
|
string */
|
||||||
} else {
|
} else {
|
||||||
/* reached end of parameter, set remaining components to 1x1 sampling */
|
/* reached end of parameter, set remaining components to 1x1 sampling */
|
||||||
cinfo->comp_info[ci].h_samp_factor = 1;
|
cinfo->comp_info[ci].h_samp_factor = 1;
|
||||||
|
|||||||
Reference in New Issue
Block a user