diff options
author | Lei Zhang <thestig@chromium.org> | 2018-08-01 17:44:48 +0000 |
---|---|---|
committer | Chromium commit bot <commit-bot@chromium.org> | 2018-08-01 17:44:48 +0000 |
commit | 0fa150a12267b69abcfe5e380b698bbbbd37d5de (patch) | |
tree | 0c6d5c396bb4fdf875271fe65c63ac7752ba5f49 /fxjs/xfa/cjx_contentarea.h | |
parent | b9e6281b72cd2ae51fd2d320430fba9c1f63fd2f (diff) | |
download | pdfium-0fa150a12267b69abcfe5e380b698bbbbd37d5de.tar.xz |
Fix assertion in opj_j2k_merge_ppt().
This patches in:
https://github.com/uclouvain/openjpeg/commit/832dfd18
https://github.com/uclouvain/openjpeg/commit/0c913b0a
Also clean up a duplicate patch number and update README.pdfium.
BUG=chromium:614691
Change-Id: I282abfe227e2f667418e5d9058e96e253b220de7
Reviewed-on: https://pdfium-review.googlesource.com/39352
Reviewed-by: Nicolás Peña Moreno <npm@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'fxjs/xfa/cjx_contentarea.h')
0 files changed, 0 insertions, 0 deletions