diff options
| author | Nicolas Pena <npm@chromium.org> | 2017-10-23 10:30:46 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-10-23 22:40:23 +0000 |
| commit | 826480cf599f61fe0366ab2bd5803dd53c9d0562 (patch) | |
| tree | d42bca4255a2ecf484b8498b08c6132dbcffe86a /third_party/libopenjpeg20/0005-jp2_apply_pclr.patch | |
| parent | ebdba614b9683ddd1d50e8960639bc54c9d4bb7a (diff) | |
| download | pdfium-826480cf599f61fe0366ab2bd5803dd53c9d0562.tar.xz | |
Upgrade LibopenJPEG to 2.3chromium/3249
Bug:
Change-Id: I4c968a4e5f41037d80e5dc64a1297cd2cbda31b1
Reviewed-on: https://pdfium-review.googlesource.com/16350
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: Nicolás Peña Moreno <npm@chromium.org>
Diffstat (limited to 'third_party/libopenjpeg20/0005-jp2_apply_pclr.patch')
| -rw-r--r-- | third_party/libopenjpeg20/0005-jp2_apply_pclr.patch | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/third_party/libopenjpeg20/0005-jp2_apply_pclr.patch b/third_party/libopenjpeg20/0005-jp2_apply_pclr.patch index c852bd057d..c8caea853c 100644 --- a/third_party/libopenjpeg20/0005-jp2_apply_pclr.patch +++ b/third_party/libopenjpeg20/0005-jp2_apply_pclr.patch @@ -1,17 +1,8 @@ diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c -index 882f1b649..3ace09654 100644 +index da4e05f82..c9562f705 100644 --- a/third_party/libopenjpeg20/jp2.c +++ b/third_party/libopenjpeg20/jp2.c -@@ -969,7 +969,7 @@ static OPJ_BOOL opj_jp2_check_color(opj_image_t *image, opj_jp2_color_t *color, - opj_event_msg(p_manager, EVT_ERROR, - "Invalid component/palette index for direct mapping %d.\n", pcol); - is_sane = OPJ_FALSE; -- } else if (pcol_usage[pcol] && cmap[i].mtyp == 1) { -+ } else if (pcol_usage[pcol] && cmap[i].mtyp != 0) { - opj_event_msg(p_manager, EVT_ERROR, "Component %d is mapped twice.\n", pcol); - is_sane = OPJ_FALSE; - } else if (cmap[i].mtyp == 0 && cmap[i].pcol != 0) { -@@ -1064,8 +1064,8 @@ static OPJ_BOOL opj_jp2_apply_pclr(opj_image_t *image, +@@ -1073,8 +1073,8 @@ static OPJ_BOOL opj_jp2_apply_pclr(opj_image_t *image, assert(pcol == 0); new_comps[i] = old_comps[cmp]; } else { @@ -22,7 +13,7 @@ index 882f1b649..3ace09654 100644 } /* Palette mapping: */ -@@ -1093,19 +1093,19 @@ static OPJ_BOOL opj_jp2_apply_pclr(opj_image_t *image, +@@ -1102,19 +1102,19 @@ static OPJ_BOOL opj_jp2_apply_pclr(opj_image_t *image, pcol = cmap[i].pcol; src = old_comps[cmp].data; assert(src); /* verified above */ |