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 /jdmrgext.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 'jdmrgext.c')
| -rw-r--r-- | jdmrgext.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) 1994-1996, Thomas G. Lane. * libjpeg-turbo Modifications: - * Copyright (C) 2011, D. R. Commander. - * For conditions of distribution and use, see the accompanying README file. + * Copyright (C) 2011, 2015, D. R. Commander. + * For conditions of distribution and use, see the accompanying README.ijg + * file. * * This file contains code for merged upsampling/color conversion. */ @@ -35,8 +36,8 @@ h2v1_merged_upsample_internal (j_decompress_ptr cinfo, register JSAMPLE * range_limit = cinfo->sample_range_limit; int * Crrtab = upsample->Cr_r_tab; int * Cbbtab = upsample->Cb_b_tab; - INT32 * Crgtab = upsample->Cr_g_tab; - INT32 * Cbgtab = upsample->Cb_g_tab; + JLONG * Crgtab = upsample->Cr_g_tab; + JLONG * Cbgtab = upsample->Cb_g_tab; SHIFT_TEMPS inptr0 = input_buf[0][in_row_group_ctr]; @@ -108,8 +109,8 @@ h2v2_merged_upsample_internal (j_decompress_ptr cinfo, register JSAMPLE * range_limit = cinfo->sample_range_limit; int * Crrtab = upsample->Cr_r_tab; int * Cbbtab = upsample->Cb_b_tab; - INT32 * Crgtab = upsample->Cr_g_tab; - INT32 * Cbgtab = upsample->Cb_g_tab; + JLONG * Crgtab = upsample->Cr_g_tab; + JLONG * Cbgtab = upsample->Cb_g_tab; SHIFT_TEMPS inptr00 = input_buf[0][in_row_group_ctr*2]; |