Calculate jpeg_simple_progression nscans correctly
This commit is contained in:
10
jcparam.c
10
jcparam.c
@@ -868,12 +868,16 @@ jpeg_simple_progression (j_compress_ptr cinfo)
|
|||||||
ncomps = cinfo->num_components;
|
ncomps = cinfo->num_components;
|
||||||
if (ncomps == 3 && cinfo->jpeg_color_space == JCS_YCbCr) {
|
if (ncomps == 3 && cinfo->jpeg_color_space == JCS_YCbCr) {
|
||||||
/* Custom script for YCbCr color images. */
|
/* Custom script for YCbCr color images. */
|
||||||
|
if (cinfo->master->compress_profile == JCP_MAX_COMPRESSION) {
|
||||||
if (cinfo->master->dc_scan_opt_mode == 0) {
|
if (cinfo->master->dc_scan_opt_mode == 0) {
|
||||||
nscans = 8; /* 1 DC scan for all components */
|
nscans = 9; /* 1 DC scan for all components */
|
||||||
} else if (cinfo->master->dc_scan_opt_mode == 1) {
|
} else if (cinfo->master->dc_scan_opt_mode == 1) {
|
||||||
nscans = 10; /* 1 DC scan for each component */
|
nscans = 11; /* 1 DC scan for each component */
|
||||||
} else {
|
} else {
|
||||||
nscans = 9; /* 1 DC scan for luminance and 1 DC scan for chroma */
|
nscans = 10; /* 1 DC scan for luminance and 1 DC scan for chroma */
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
nscans = 10; /* 2 DC scans and 8 AC scans */
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
/* All-purpose script for other color spaces. */
|
/* All-purpose script for other color spaces. */
|
||||||
|
|||||||
Reference in New Issue
Block a user