diff options
| author | Tom Hudson <tomhudson@google.com> | 2016-05-04 13:22:56 -0400 |
|---|---|---|
| committer | Tom Hudson <tomhudson@google.com> | 2016-05-04 13:22:56 -0400 |
| commit | 0d47d2d3a728e78676a15b1d818cc668cb7e5a9c (patch) | |
| tree | 044a430eeaa2dec4d6de7b624da15fda1b8ed25f /jdcolext.c | |
| parent | 9d35298a6223278a66423f828a949d93d94d5911 (diff) | |
Update to libjpeg_turbo 1.4.90
(Duplicate of https://codereview.chromium.org/1939823002/ for landing.)
TBR=noel@chromium.org,thakis@chromium.org
BUG=608347, 398235, 591927
Review URL: https://codereview.chromium.org/1953443002 .
Diffstat (limited to 'jdcolext.c')
| -rw-r--r-- | jdcolext.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -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 */ |