diff options
| author | Aaron Gable <agable@chromium.org> | 2015-08-11 13:03:18 -0700 |
|---|---|---|
| committer | Aaron Gable <agable@chromium.org> | 2015-08-11 13:03:18 -0700 |
| commit | 631e2dd119d49794e3572b6ca3f16ee39d59f372 (patch) | |
| tree | 820b6fb4c4e7cf4f5858611a3dbe65970c614e13 /jdhuff.c | |
| parent | feec46f80444b8eed4126a86a2c0e2cffe1c9673 (diff) | |
Patch fix for "Add jpeg_skip_scanlines() API to libjpeg-turbo"
https://codereview.chromium.org/1271803002/
"jpeg_skip_scanlines() API, a subset decoding optimization
aimed at Android, was submitted upstream r1582. Pull that
change, and sundry fixes, into the Chromium repo.
This new API is targetted at Android devices, not Chrome,
and should have no affect on JPEG decode behavior or perf
of Chrome.
Chrome uses suspending data source JPEG decoding, and the
new API does not support such sources. Adding support for
suspending data sources is a future TODO, should the need
arise (refer to skbug.com/4036)."
BUG=515694
BUG=468914
R=agable@chromium.org
Review URL: https://codereview.chromium.org/1291463002 .
Diffstat (limited to 'jdhuff.c')
| -rw-r--r-- | jdhuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -660,7 +660,7 @@ decode_mcu_fast (j_decompress_ptr cinfo, JBLOCKROW *MCU_data) ASSIGN_STATE(state, entropy->saved); for (blkn = 0; blkn < cinfo->blocks_in_MCU; blkn++) { - JBLOCKROW block = MCU_data[blkn]; + JBLOCKROW block = MCU_data ? MCU_data[blkn] : NULL; d_derived_tbl * dctbl = entropy->dc_cur_tbls[blkn]; d_derived_tbl * actbl = entropy->ac_cur_tbls[blkn]; register int s, k, r, l; |