diff options
author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2021-03-04 14:21:13 +0100 |
---|---|---|
committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2021-03-05 12:25:36 +0100 |
commit | cb1eed0989095e6086394e4b1eec0db50461fbb7 (patch) | |
tree | 7ccf346f270af007ba3bad9af1be7526a834f27d /src/3rdparty/libjpeg/src/jdcoefct.c | |
parent | 326c4ac4cb42b3ec62d69bdb16ce7a2100d18683 (diff) |
Update bundled libjpeg-turbo to version 2.0.6
[ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.6
Change-Id: I3e308d241853edf3c1d616955cda203220a258d8
Reviewed-by: Liang Qi <liang.qi@qt.io>
(cherry picked from commit ede0082f861146d441df641d93f815dbe63a9076)
Diffstat (limited to 'src/3rdparty/libjpeg/src/jdcoefct.c')
-rw-r--r-- | src/3rdparty/libjpeg/src/jdcoefct.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/3rdparty/libjpeg/src/jdcoefct.c b/src/3rdparty/libjpeg/src/jdcoefct.c index 723a9ac2be..2ba6aa11e4 100644 --- a/src/3rdparty/libjpeg/src/jdcoefct.c +++ b/src/3rdparty/libjpeg/src/jdcoefct.c @@ -6,7 +6,7 @@ * libjpeg-turbo Modifications: * Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB * Copyright (C) 2010, 2015-2016, D. R. Commander. - * Copyright (C) 2015, Google, Inc. + * Copyright (C) 2015, 2020, Google, Inc. * For conditions of distribution and use, see the accompanying README.ijg * file. * @@ -495,11 +495,13 @@ decompress_smooth_data(j_decompress_ptr cinfo, JSAMPIMAGE output_buf) if (first_row && block_row == 0) prev_block_row = buffer_ptr; else - prev_block_row = buffer[block_row - 1]; + prev_block_row = buffer[block_row - 1] + + cinfo->master->first_MCU_col[ci]; if (last_row && block_row == block_rows - 1) next_block_row = buffer_ptr; else - next_block_row = buffer[block_row + 1]; + next_block_row = buffer[block_row + 1] + + cinfo->master->first_MCU_col[ci]; /* We fetch the surrounding DC values using a sliding-register approach. * Initialize all nine here so as to do the right thing on narrow pics. */ |