| Index: jccolext.c
|
| diff --git a/jccolext.c b/jccolext.c
|
| index dda3beb84ceda8033783b94f76ad7ef4311ef57e..479b320446d3f7114f4f352006fbafd044ba2236 100644
|
| --- a/jccolext.c
|
| +++ b/jccolext.c
|
| @@ -4,8 +4,9 @@
|
| * This file was part of the Independent JPEG Group's software:
|
| * Copyright (C) 1991-1996, Thomas G. Lane.
|
| * libjpeg-turbo Modifications:
|
| - * Copyright (C) 2009-2012, D. R. Commander.
|
| - * For conditions of distribution and use, see the accompanying README file.
|
| + * Copyright (C) 2009-2012, 2015, D. R. Commander.
|
| + * For conditions of distribution and use, see the accompanying README.ijg
|
| + * file.
|
| *
|
| * This file contains input colorspace conversion routines.
|
| */
|
| @@ -34,7 +35,7 @@ rgb_ycc_convert_internal (j_compress_ptr cinfo,
|
| {
|
| my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
|
| register int r, g, b;
|
| - register INT32 * ctab = cconvert->rgb_ycc_tab;
|
| + register JLONG * ctab = cconvert->rgb_ycc_tab;
|
| register JSAMPROW inptr;
|
| register JSAMPROW outptr0, outptr1, outptr2;
|
| register JDIMENSION col;
|
| @@ -58,16 +59,16 @@ rgb_ycc_convert_internal (j_compress_ptr cinfo,
|
| */
|
| /* Y */
|
| outptr0[col] = (JSAMPLE)
|
| - ((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
|
| - >> SCALEBITS);
|
| + ((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
|
| + >> SCALEBITS);
|
| /* Cb */
|
| outptr1[col] = (JSAMPLE)
|
| - ((ctab[r+R_CB_OFF] + ctab[g+G_CB_OFF] + ctab[b+B_CB_OFF])
|
| - >> SCALEBITS);
|
| + ((ctab[r+R_CB_OFF] + ctab[g+G_CB_OFF] + ctab[b+B_CB_OFF])
|
| + >> SCALEBITS);
|
| /* Cr */
|
| outptr2[col] = (JSAMPLE)
|
| - ((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF])
|
| - >> SCALEBITS);
|
| + ((ctab[r+R_CR_OFF] + ctab[g+G_CR_OFF] + ctab[b+B_CR_OFF])
|
| + >> SCALEBITS);
|
| }
|
| }
|
| }
|
| @@ -91,7 +92,7 @@ rgb_gray_convert_internal (j_compress_ptr cinfo,
|
| {
|
| my_cconvert_ptr cconvert = (my_cconvert_ptr) cinfo->cconvert;
|
| register int r, g, b;
|
| - register INT32 * ctab = cconvert->rgb_ycc_tab;
|
| + register JLONG * ctab = cconvert->rgb_ycc_tab;
|
| register JSAMPROW inptr;
|
| register JSAMPROW outptr;
|
| register JDIMENSION col;
|
| @@ -108,8 +109,8 @@ rgb_gray_convert_internal (j_compress_ptr cinfo,
|
| inptr += RGB_PIXELSIZE;
|
| /* Y */
|
| outptr[col] = (JSAMPLE)
|
| - ((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
|
| - >> SCALEBITS);
|
| + ((ctab[r+R_Y_OFF] + ctab[g+G_Y_OFF] + ctab[b+B_Y_OFF])
|
| + >> SCALEBITS);
|
| }
|
| }
|
| }
|
|
|