tree 0c6d5c396bb4fdf875271fe65c63ac7752ba5f49
parent b9e6281b72cd2ae51fd2d320430fba9c1f63fd2f
author Lei Zhang <thestig@chromium.org> 1533145488 +0000
committer Chromium commit bot <commit-bot@chromium.org> 1533145488 +0000

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>