Index: jdcolext.c |
diff --git a/jdcolext.c b/jdcolext.c |
index 6e9e31a937783c0c32b4d81600690eab4d5afaa2..59b676cc4dda4f5581fc881611d46c7abf637852 100644 |
--- a/jdcolext.c |
+++ b/jdcolext.c |
@@ -4,8 +4,9 @@ |
* This file was part of the Independent JPEG Group's software: |
* Copyright (C) 1991-1997, Thomas G. Lane. |
* libjpeg-turbo Modifications: |
- * Copyright (C) 2009, 2011, D. R. Commander. |
- * For conditions of distribution and use, see the accompanying README file. |
+ * Copyright (C) 2009, 2011, 2015, D. R. Commander. |
+ * For conditions of distribution and use, see the accompanying README.ijg |
+ * file. |
* |
* This file contains output colorspace conversion routines. |
*/ |
@@ -41,8 +42,8 @@ ycc_rgb_convert_internal (j_decompress_ptr cinfo, |
register JSAMPLE * range_limit = cinfo->sample_range_limit; |
register int * Crrtab = cconvert->Cr_r_tab; |
register int * Cbbtab = cconvert->Cb_b_tab; |
- register INT32 * Crgtab = cconvert->Cr_g_tab; |
- register INT32 * Cbgtab = cconvert->Cb_g_tab; |
+ register JLONG * Crgtab = cconvert->Cr_g_tab; |
+ register JLONG * Cbgtab = cconvert->Cb_g_tab; |
SHIFT_TEMPS |
while (--num_rows >= 0) { |
@@ -58,8 +59,8 @@ ycc_rgb_convert_internal (j_decompress_ptr cinfo, |
/* Range-limiting is essential due to noise introduced by DCT losses. */ |
outptr[RGB_RED] = range_limit[y + Crrtab[cr]]; |
outptr[RGB_GREEN] = range_limit[y + |
- ((int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], |
- SCALEBITS))]; |
+ ((int) RIGHT_SHIFT(Cbgtab[cb] + Crgtab[cr], |
+ SCALEBITS))]; |
outptr[RGB_BLUE] = range_limit[y + Cbbtab[cb]]; |
/* Set unused byte to 0xFF so it can be interpreted as an opaque */ |
/* alpha channel value */ |