mirror of
https://github.com/juce-framework/JUCE.git
synced 2026-01-10 23:44:24 +00:00
Merge 88e8ba9fd8 into bc7339fe07
This commit is contained in:
commit
2ccf0e7078
2 changed files with 4 additions and 2 deletions
|
|
@ -302,7 +302,8 @@ master_selection (j_decompress_ptr cinfo)
|
||||||
if (cinfo->raw_data_out)
|
if (cinfo->raw_data_out)
|
||||||
ERREXIT(cinfo, JERR_NOTIMPL);
|
ERREXIT(cinfo, JERR_NOTIMPL);
|
||||||
/* 2-pass quantizer only works in 3-component color space. */
|
/* 2-pass quantizer only works in 3-component color space. */
|
||||||
if (cinfo->out_color_components != 3) {
|
if (cinfo->out_color_components != 3 ||
|
||||||
|
cinfo->out_color_space == JCS_RGB565) {
|
||||||
cinfo->enable_1pass_quant = TRUE;
|
cinfo->enable_1pass_quant = TRUE;
|
||||||
cinfo->enable_external_quant = FALSE;
|
cinfo->enable_external_quant = FALSE;
|
||||||
cinfo->enable_2pass_quant = FALSE;
|
cinfo->enable_2pass_quant = FALSE;
|
||||||
|
|
|
||||||
|
|
@ -1256,7 +1256,8 @@ jinit_2pass_quantizer (j_decompress_ptr cinfo)
|
||||||
cquantize->error_limiter = NULL;
|
cquantize->error_limiter = NULL;
|
||||||
|
|
||||||
/* Make sure jdmaster didn't give me a case I can't handle */
|
/* Make sure jdmaster didn't give me a case I can't handle */
|
||||||
if (cinfo->out_color_components != 3)
|
if (cinfo->out_color_components != 3 ||
|
||||||
|
cinfo->out_color_space == JCS_RGB565)
|
||||||
ERREXIT(cinfo, JERR_NOTIMPL);
|
ERREXIT(cinfo, JERR_NOTIMPL);
|
||||||
|
|
||||||
/* Allocate the histogram/inverse colormap storage */
|
/* Allocate the histogram/inverse colormap storage */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue