|
|
|
@ -2,7 +2,7 @@ |
|
|
|
* jccolor.c |
|
|
|
* jccolor.c |
|
|
|
* |
|
|
|
* |
|
|
|
* Copyright (C) 1991-1996, Thomas G. Lane. |
|
|
|
* Copyright (C) 1991-1996, Thomas G. Lane. |
|
|
|
* Modified 2011-2013 by Guido Vollbeding. |
|
|
|
* Modified 2011-2019 by Guido Vollbeding. |
|
|
|
* This file is part of the Independent JPEG Group's software. |
|
|
|
* This file is part of the Independent JPEG Group's software. |
|
|
|
* For conditions of distribution and use, see the accompanying README file. |
|
|
|
* For conditions of distribution and use, see the accompanying README file. |
|
|
|
* |
|
|
|
* |
|
|
|
@ -105,14 +105,14 @@ rgb_ycc_start (j_compress_ptr cinfo) |
|
|
|
/* Allocate and fill in the conversion tables. */ |
|
|
|
/* Allocate and fill in the conversion tables. */ |
|
|
|
cconvert->rgb_ycc_tab = rgb_ycc_tab = (INT32 *) |
|
|
|
cconvert->rgb_ycc_tab = rgb_ycc_tab = (INT32 *) |
|
|
|
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, |
|
|
|
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, |
|
|
|
(TABLE_SIZE * SIZEOF(INT32))); |
|
|
|
TABLE_SIZE * SIZEOF(INT32)); |
|
|
|
|
|
|
|
|
|
|
|
for (i = 0; i <= MAXJSAMPLE; i++) { |
|
|
|
for (i = 0; i <= MAXJSAMPLE; i++) { |
|
|
|
rgb_ycc_tab[i+R_Y_OFF] = FIX(0.299) * i; |
|
|
|
rgb_ycc_tab[i+R_Y_OFF] = FIX(0.299) * i; |
|
|
|
rgb_ycc_tab[i+G_Y_OFF] = FIX(0.587) * i; |
|
|
|
rgb_ycc_tab[i+G_Y_OFF] = FIX(0.587) * i; |
|
|
|
rgb_ycc_tab[i+B_Y_OFF] = FIX(0.114) * i + ONE_HALF; |
|
|
|
rgb_ycc_tab[i+B_Y_OFF] = FIX(0.114) * i + ONE_HALF; |
|
|
|
rgb_ycc_tab[i+R_CB_OFF] = (-FIX(0.168735892)) * i; |
|
|
|
rgb_ycc_tab[i+R_CB_OFF] = (- FIX(0.168735892)) * i; |
|
|
|
rgb_ycc_tab[i+G_CB_OFF] = (-FIX(0.331264108)) * i; |
|
|
|
rgb_ycc_tab[i+G_CB_OFF] = (- FIX(0.331264108)) * i; |
|
|
|
/* We use a rounding fudge-factor of 0.5-epsilon for Cb and Cr.
|
|
|
|
/* We use a rounding fudge-factor of 0.5-epsilon for Cb and Cr.
|
|
|
|
* This ensures that the maximum output will round to MAXJSAMPLE |
|
|
|
* This ensures that the maximum output will round to MAXJSAMPLE |
|
|
|
* not MAXJSAMPLE+1, and thus that we don't have to range-limit. |
|
|
|
* not MAXJSAMPLE+1, and thus that we don't have to range-limit. |
|
|
|
@ -121,8 +121,8 @@ rgb_ycc_start (j_compress_ptr cinfo) |
|
|
|
/* B=>Cb and R=>Cr tables are the same
|
|
|
|
/* B=>Cb and R=>Cr tables are the same
|
|
|
|
rgb_ycc_tab[i+R_CR_OFF] = FIX(0.5) * i + CBCR_OFFSET + ONE_HALF-1; |
|
|
|
rgb_ycc_tab[i+R_CR_OFF] = FIX(0.5) * i + CBCR_OFFSET + ONE_HALF-1; |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
rgb_ycc_tab[i+G_CR_OFF] = (-FIX(0.418687589)) * i; |
|
|
|
rgb_ycc_tab[i+G_CR_OFF] = (- FIX(0.418687589)) * i; |
|
|
|
rgb_ycc_tab[i+B_CR_OFF] = (-FIX(0.081312411)) * i; |
|
|
|
rgb_ycc_tab[i+B_CR_OFF] = (- FIX(0.081312411)) * i; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -131,12 +131,12 @@ rgb_ycc_start (j_compress_ptr cinfo) |
|
|
|
* Convert some rows of samples to the JPEG colorspace. |
|
|
|
* Convert some rows of samples to the JPEG colorspace. |
|
|
|
* |
|
|
|
* |
|
|
|
* Note that we change from the application's interleaved-pixel format |
|
|
|
* Note that we change from the application's interleaved-pixel format |
|
|
|
* to our internal noninterleaved, one-plane-per-component format. |
|
|
|
* to our internal noninterleaved, one-plane-per-component format. The |
|
|
|
* The input buffer is therefore three times as wide as the output buffer. |
|
|
|
* input buffer is therefore three times as wide as the output buffer. |
|
|
|
* |
|
|
|
* |
|
|
|
* A starting row offset is provided only for the output buffer. The caller |
|
|
|
* A starting row offset is provided only for the output buffer. The |
|
|
|
* can easily adjust the passed input_buf value to accommodate any row |
|
|
|
* caller can easily adjust the passed input_buf value to accommodate |
|
|
|
* offset required on that side. |
|
|
|
* any row offset required on that side. |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
|
|
METHODDEF(void) |
|
|
|
METHODDEF(void) |
|
|
|
@ -145,8 +145,8 @@ rgb_ycc_convert (j_compress_ptr cinfo, |
|
|
|
JDIMENSION output_row, int num_rows) |
|
|
|
JDIMENSION output_row, int num_rows) |
|
|
|
{ |
|
|
|
{ |
|
|
|
my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; |
|
|
|
my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; |
|
|
|
register INT32 * ctab = cconvert->rgb_ycc_tab; |
|
|
|
|
|
|
|
register int r, g, b; |
|
|
|
register int r, g, b; |
|
|
|
|
|
|
|
register INT32 * ctab = cconvert->rgb_ycc_tab; |
|
|
|
register JSAMPROW inptr; |
|
|
|
register JSAMPROW inptr; |
|
|
|
register JSAMPROW outptr0, outptr1, outptr2; |
|
|
|
register JSAMPROW outptr0, outptr1, outptr2; |
|
|
|
register JDIMENSION col; |
|
|
|
register JDIMENSION col; |
|
|
|
@ -162,6 +162,7 @@ rgb_ycc_convert (j_compress_ptr cinfo, |
|
|
|
r = GETJSAMPLE(inptr[RGB_RED]); |
|
|
|
r = GETJSAMPLE(inptr[RGB_RED]); |
|
|
|
g = GETJSAMPLE(inptr[RGB_GREEN]); |
|
|
|
g = GETJSAMPLE(inptr[RGB_GREEN]); |
|
|
|
b = GETJSAMPLE(inptr[RGB_BLUE]); |
|
|
|
b = GETJSAMPLE(inptr[RGB_BLUE]); |
|
|
|
|
|
|
|
inptr += RGB_PIXELSIZE; |
|
|
|
/* If the inputs are 0..MAXJSAMPLE, the outputs of these equations
|
|
|
|
/* If the inputs are 0..MAXJSAMPLE, the outputs of these equations
|
|
|
|
* must be too; we do not need an explicit range-limiting operation. |
|
|
|
* must be too; we do not need an explicit range-limiting operation. |
|
|
|
* Hence the value being shifted is never negative, and we don't |
|
|
|
* Hence the value being shifted is never negative, and we don't |
|
|
|
@ -179,7 +180,6 @@ rgb_ycc_convert (j_compress_ptr cinfo, |
|
|
|
outptr2[col] = (JSAMPLE) |
|
|
|
outptr2[col] = (JSAMPLE) |
|
|
|
((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF]) |
|
|
|
((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF]) |
|
|
|
>> SCALEBITS); |
|
|
|
>> SCALEBITS); |
|
|
|
inptr += RGB_PIXELSIZE; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -201,8 +201,8 @@ rgb_gray_convert (j_compress_ptr cinfo, |
|
|
|
JDIMENSION output_row, int num_rows) |
|
|
|
JDIMENSION output_row, int num_rows) |
|
|
|
{ |
|
|
|
{ |
|
|
|
my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; |
|
|
|
my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; |
|
|
|
register INT32 * ctab = cconvert->rgb_ycc_tab; |
|
|
|
|
|
|
|
register int r, g, b; |
|
|
|
register int r, g, b; |
|
|
|
|
|
|
|
register INT32 * ctab = cconvert->rgb_ycc_tab; |
|
|
|
register JSAMPROW inptr; |
|
|
|
register JSAMPROW inptr; |
|
|
|
register JSAMPROW outptr; |
|
|
|
register JSAMPROW outptr; |
|
|
|
register JDIMENSION col; |
|
|
|
register JDIMENSION col; |
|
|
|
@ -215,11 +215,11 @@ rgb_gray_convert (j_compress_ptr cinfo, |
|
|
|
r = GETJSAMPLE(inptr[RGB_RED]); |
|
|
|
r = GETJSAMPLE(inptr[RGB_RED]); |
|
|
|
g = GETJSAMPLE(inptr[RGB_GREEN]); |
|
|
|
g = GETJSAMPLE(inptr[RGB_GREEN]); |
|
|
|
b = GETJSAMPLE(inptr[RGB_BLUE]); |
|
|
|
b = GETJSAMPLE(inptr[RGB_BLUE]); |
|
|
|
|
|
|
|
inptr += RGB_PIXELSIZE; |
|
|
|
/* Y */ |
|
|
|
/* Y */ |
|
|
|
outptr[col] = (JSAMPLE) |
|
|
|
outptr[col] = (JSAMPLE) |
|
|
|
((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF]) |
|
|
|
((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF]) |
|
|
|
>> SCALEBITS); |
|
|
|
>> SCALEBITS); |
|
|
|
inptr += RGB_PIXELSIZE; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -228,8 +228,8 @@ rgb_gray_convert (j_compress_ptr cinfo, |
|
|
|
/*
|
|
|
|
/*
|
|
|
|
* Convert some rows of samples to the JPEG colorspace. |
|
|
|
* Convert some rows of samples to the JPEG colorspace. |
|
|
|
* This version handles Adobe-style CMYK->YCCK conversion, |
|
|
|
* This version handles Adobe-style CMYK->YCCK conversion, |
|
|
|
* where we convert R=1-C, G=1-M, and B=1-Y to YCbCr using the same |
|
|
|
* where we convert R=1-C, G=1-M, and B=1-Y to YCbCr using the |
|
|
|
* conversion as above, while passing K (black) unchanged. |
|
|
|
* same conversion as above, while passing K (black) unchanged. |
|
|
|
* We assume rgb_ycc_start has been called. |
|
|
|
* We assume rgb_ycc_start has been called. |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
|
|
|
|
|
|
|
|
@ -239,8 +239,8 @@ cmyk_ycck_convert (j_compress_ptr cinfo, |
|
|
|
JDIMENSION output_row, int num_rows) |
|
|
|
JDIMENSION output_row, int num_rows) |
|
|
|
{ |
|
|
|
{ |
|
|
|
my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; |
|
|
|
my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert; |
|
|
|
register INT32 * ctab = cconvert->rgb_ycc_tab; |
|
|
|
|
|
|
|
register int r, g, b; |
|
|
|
register int r, g, b; |
|
|
|
|
|
|
|
register INT32 * ctab = cconvert->rgb_ycc_tab; |
|
|
|
register JSAMPROW inptr; |
|
|
|
register JSAMPROW inptr; |
|
|
|
register JSAMPROW outptr0, outptr1, outptr2, outptr3; |
|
|
|
register JSAMPROW outptr0, outptr1, outptr2, outptr3; |
|
|
|
register JDIMENSION col; |
|
|
|
register JDIMENSION col; |
|
|
|
@ -259,6 +259,7 @@ cmyk_ycck_convert (j_compress_ptr cinfo, |
|
|
|
b = MAXJSAMPLE - GETJSAMPLE(inptr[2]); |
|
|
|
b = MAXJSAMPLE - GETJSAMPLE(inptr[2]); |
|
|
|
/* K passes through as-is */ |
|
|
|
/* K passes through as-is */ |
|
|
|
outptr3[col] = inptr[3]; /* don't need GETJSAMPLE here */ |
|
|
|
outptr3[col] = inptr[3]; /* don't need GETJSAMPLE here */ |
|
|
|
|
|
|
|
inptr += 4; |
|
|
|
/* If the inputs are 0..MAXJSAMPLE, the outputs of these equations
|
|
|
|
/* If the inputs are 0..MAXJSAMPLE, the outputs of these equations
|
|
|
|
* must be too; we do not need an explicit range-limiting operation. |
|
|
|
* must be too; we do not need an explicit range-limiting operation. |
|
|
|
* Hence the value being shifted is never negative, and we don't |
|
|
|
* Hence the value being shifted is never negative, and we don't |
|
|
|
@ -276,7 +277,6 @@ cmyk_ycck_convert (j_compress_ptr cinfo, |
|
|
|
outptr2[col] = (JSAMPLE) |
|
|
|
outptr2[col] = (JSAMPLE) |
|
|
|
((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF]) |
|
|
|
((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF]) |
|
|
|
>> SCALEBITS); |
|
|
|
>> SCALEBITS); |
|
|
|
inptr += 4; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -312,13 +312,13 @@ rgb_rgb1_convert (j_compress_ptr cinfo, |
|
|
|
r = GETJSAMPLE(inptr[RGB_RED]); |
|
|
|
r = GETJSAMPLE(inptr[RGB_RED]); |
|
|
|
g = GETJSAMPLE(inptr[RGB_GREEN]); |
|
|
|
g = GETJSAMPLE(inptr[RGB_GREEN]); |
|
|
|
b = GETJSAMPLE(inptr[RGB_BLUE]); |
|
|
|
b = GETJSAMPLE(inptr[RGB_BLUE]); |
|
|
|
|
|
|
|
inptr += RGB_PIXELSIZE; |
|
|
|
/* Assume that MAXJSAMPLE+1 is a power of 2, so that the MOD
|
|
|
|
/* Assume that MAXJSAMPLE+1 is a power of 2, so that the MOD
|
|
|
|
* (modulo) operator is equivalent to the bitmask operator AND. |
|
|
|
* (modulo) operator is equivalent to the bitmask operator AND. |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
outptr0[col] = (JSAMPLE) ((r - g + CENTERJSAMPLE) & MAXJSAMPLE); |
|
|
|
outptr0[col] = (JSAMPLE) ((r - g + CENTERJSAMPLE) & MAXJSAMPLE); |
|
|
|
outptr1[col] = (JSAMPLE) g; |
|
|
|
outptr1[col] = (JSAMPLE) g; |
|
|
|
outptr2[col] = (JSAMPLE) ((b - g + CENTERJSAMPLE) & MAXJSAMPLE); |
|
|
|
outptr2[col] = (JSAMPLE) ((b - g + CENTERJSAMPLE) & MAXJSAMPLE); |
|
|
|
inptr += RGB_PIXELSIZE; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -335,17 +335,17 @@ grayscale_convert (j_compress_ptr cinfo, |
|
|
|
JSAMPARRAY input_buf, JSAMPIMAGE output_buf, |
|
|
|
JSAMPARRAY input_buf, JSAMPIMAGE output_buf, |
|
|
|
JDIMENSION output_row, int num_rows) |
|
|
|
JDIMENSION output_row, int num_rows) |
|
|
|
{ |
|
|
|
{ |
|
|
|
int instride = cinfo->input_components; |
|
|
|
|
|
|
|
register JSAMPROW inptr; |
|
|
|
register JSAMPROW inptr; |
|
|
|
register JSAMPROW outptr; |
|
|
|
register JSAMPROW outptr; |
|
|
|
register JDIMENSION col; |
|
|
|
register JDIMENSION count; |
|
|
|
|
|
|
|
register int instride = cinfo->input_components; |
|
|
|
JDIMENSION num_cols = cinfo->image_width; |
|
|
|
JDIMENSION num_cols = cinfo->image_width; |
|
|
|
|
|
|
|
|
|
|
|
while (--num_rows >= 0) { |
|
|
|
while (--num_rows >= 0) { |
|
|
|
inptr = *input_buf++; |
|
|
|
inptr = *input_buf++; |
|
|
|
outptr = output_buf[0][output_row++]; |
|
|
|
outptr = output_buf[0][output_row++]; |
|
|
|
for (col = 0; col < num_cols; col++) { |
|
|
|
for (count = num_cols; count > 0; count--) { |
|
|
|
outptr[col] = inptr[0]; /* don't need GETJSAMPLE() here */ |
|
|
|
*outptr++ = *inptr; /* don't need GETJSAMPLE() here */ |
|
|
|
inptr += instride; |
|
|
|
inptr += instride; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -396,21 +396,21 @@ null_convert (j_compress_ptr cinfo, |
|
|
|
JSAMPARRAY input_buf, JSAMPIMAGE output_buf, |
|
|
|
JSAMPARRAY input_buf, JSAMPIMAGE output_buf, |
|
|
|
JDIMENSION output_row, int num_rows) |
|
|
|
JDIMENSION output_row, int num_rows) |
|
|
|
{ |
|
|
|
{ |
|
|
|
int ci; |
|
|
|
|
|
|
|
register int nc = cinfo->num_components; |
|
|
|
|
|
|
|
register JSAMPROW inptr; |
|
|
|
register JSAMPROW inptr; |
|
|
|
register JSAMPROW outptr; |
|
|
|
register JSAMPROW outptr; |
|
|
|
register JDIMENSION col; |
|
|
|
register JDIMENSION count; |
|
|
|
|
|
|
|
register int num_comps = cinfo->num_components; |
|
|
|
JDIMENSION num_cols = cinfo->image_width; |
|
|
|
JDIMENSION num_cols = cinfo->image_width; |
|
|
|
|
|
|
|
int ci; |
|
|
|
|
|
|
|
|
|
|
|
while (--num_rows >= 0) { |
|
|
|
while (--num_rows >= 0) { |
|
|
|
/* It seems fastest to make a separate pass for each component. */ |
|
|
|
/* It seems fastest to make a separate pass for each component. */ |
|
|
|
for (ci = 0; ci < nc; ci++) { |
|
|
|
for (ci = 0; ci < num_comps; ci++) { |
|
|
|
inptr = input_buf[0] + ci; |
|
|
|
inptr = input_buf[0] + ci; |
|
|
|
outptr = output_buf[ci][output_row]; |
|
|
|
outptr = output_buf[ci][output_row]; |
|
|
|
for (col = 0; col < num_cols; col++) { |
|
|
|
for (count = num_cols; count > 0; count--) { |
|
|
|
*outptr++ = *inptr; /* don't need GETJSAMPLE() here */ |
|
|
|
*outptr++ = *inptr; /* don't need GETJSAMPLE() here */ |
|
|
|
inptr += nc; |
|
|
|
inptr += num_comps; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
input_buf++; |
|
|
|
input_buf++; |
|
|
|
@ -439,9 +439,8 @@ jinit_color_converter (j_compress_ptr cinfo) |
|
|
|
{ |
|
|
|
{ |
|
|
|
my_cconvert_ptr cconvert; |
|
|
|
my_cconvert_ptr cconvert; |
|
|
|
|
|
|
|
|
|
|
|
cconvert = (my_cconvert_ptr) |
|
|
|
cconvert = (my_cconvert_ptr) (*cinfo->mem->alloc_small) |
|
|
|
(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, |
|
|
|
((j_common_ptr) cinfo, JPOOL_IMAGE, SIZEOF(my_color_converter)); |
|
|
|
SIZEOF(my_color_converter)); |
|
|
|
|
|
|
|
cinfo->cconvert = &cconvert->pub; |
|
|
|
cinfo->cconvert = &cconvert->pub; |
|
|
|
/* set start_pass to null method until we find out differently */ |
|
|
|
/* set start_pass to null method until we find out differently */ |
|
|
|
cconvert->pub.start_pass = null_method; |
|
|
|
cconvert->pub.start_pass = null_method; |
|
|
|
@ -455,9 +454,11 @@ jinit_color_converter (j_compress_ptr cinfo) |
|
|
|
|
|
|
|
|
|
|
|
case JCS_RGB: |
|
|
|
case JCS_RGB: |
|
|
|
case JCS_BG_RGB: |
|
|
|
case JCS_BG_RGB: |
|
|
|
|
|
|
|
#if RGB_PIXELSIZE != 3 |
|
|
|
if (cinfo->input_components != RGB_PIXELSIZE) |
|
|
|
if (cinfo->input_components != RGB_PIXELSIZE) |
|
|
|
ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE); |
|
|
|
ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE); |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
#endif /* else share code with YCbCr */ |
|
|
|
|
|
|
|
|
|
|
|
case JCS_YCbCr: |
|
|
|
case JCS_YCbCr: |
|
|
|
case JCS_BG_YCC: |
|
|
|
case JCS_BG_YCC: |
|
|
|
@ -474,7 +475,6 @@ jinit_color_converter (j_compress_ptr cinfo) |
|
|
|
default: /* JCS_UNKNOWN can be anything */ |
|
|
|
default: /* JCS_UNKNOWN can be anything */ |
|
|
|
if (cinfo->input_components < 1) |
|
|
|
if (cinfo->input_components < 1) |
|
|
|
ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE); |
|
|
|
ERREXIT(cinfo, JERR_BAD_IN_COLORSPACE); |
|
|
|
break; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/* Support color transform only for RGB colorspaces */ |
|
|
|
/* Support color transform only for RGB colorspaces */ |
|
|
|
@ -507,7 +507,8 @@ jinit_color_converter (j_compress_ptr cinfo) |
|
|
|
case JCS_BG_RGB: |
|
|
|
case JCS_BG_RGB: |
|
|
|
if (cinfo->num_components != 3) |
|
|
|
if (cinfo->num_components != 3) |
|
|
|
ERREXIT(cinfo, JERR_BAD_J_COLORSPACE); |
|
|
|
ERREXIT(cinfo, JERR_BAD_J_COLORSPACE); |
|
|
|
if (cinfo->in_color_space == cinfo->jpeg_color_space) { |
|
|
|
if (cinfo->in_color_space != cinfo->jpeg_color_space) |
|
|
|
|
|
|
|
ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); |
|
|
|
switch (cinfo->color_transform) { |
|
|
|
switch (cinfo->color_transform) { |
|
|
|
case JCT_NONE: |
|
|
|
case JCT_NONE: |
|
|
|
cconvert->pub.color_convert = rgb_convert; |
|
|
|
cconvert->pub.color_convert = rgb_convert; |
|
|
|
@ -518,8 +519,6 @@ jinit_color_converter (j_compress_ptr cinfo) |
|
|
|
default: |
|
|
|
default: |
|
|
|
ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); |
|
|
|
ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); |
|
|
|
} |
|
|
|
} |
|
|
|
} else |
|
|
|
|
|
|
|
ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); |
|
|
|
|
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
|
|
|
|
case JCS_YCbCr: |
|
|
|
case JCS_YCbCr: |
|
|
|
@ -572,10 +571,9 @@ jinit_color_converter (j_compress_ptr cinfo) |
|
|
|
case JCS_CMYK: |
|
|
|
case JCS_CMYK: |
|
|
|
if (cinfo->num_components != 4) |
|
|
|
if (cinfo->num_components != 4) |
|
|
|
ERREXIT(cinfo, JERR_BAD_J_COLORSPACE); |
|
|
|
ERREXIT(cinfo, JERR_BAD_J_COLORSPACE); |
|
|
|
if (cinfo->in_color_space == JCS_CMYK) |
|
|
|
if (cinfo->in_color_space != JCS_CMYK) |
|
|
|
cconvert->pub.color_convert = null_convert; |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); |
|
|
|
ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); |
|
|
|
|
|
|
|
cconvert->pub.color_convert = null_convert; |
|
|
|
break; |
|
|
|
break; |
|
|
|
|
|
|
|
|
|
|
|
case JCS_YCCK: |
|
|
|
case JCS_YCCK: |
|
|
|
@ -599,6 +597,5 @@ jinit_color_converter (j_compress_ptr cinfo) |
|
|
|
cinfo->num_components != cinfo->input_components) |
|
|
|
cinfo->num_components != cinfo->input_components) |
|
|
|
ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); |
|
|
|
ERREXIT(cinfo, JERR_CONVERSION_NOTIMPL); |
|
|
|
cconvert->pub.color_convert = null_convert; |
|
|
|
cconvert->pub.color_convert = null_convert; |
|
|
|
break; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
Alexander Alekhin
5 years ago