Merge to XFA: Fix JPX image rendering that regressed due to several security fixes.
authorLei Zhang <thestig@chromium.org>
Sat, 28 Feb 2015 03:57:05 +0000 (19:57 -0800)
committerLei Zhang <thestig@chromium.org>
Sat, 28 Feb 2015 03:57:05 +0000 (19:57 -0800)
commit346a1a9fe42a04dd04fb2bd2dbd2b43377cca9a3
tree1d70324bde76e1bb6c37e82a4c339de8621a6ab3
parent2d9d0ca7713796a433f270bb2fdf39201cdb0384
Merge to XFA: Fix JPX image rendering that regressed due to several security fixes.

Original Review URL: https://codereview.chromium.org/892553002

(cherry picked from commit 254360730190cc6d6e3de325ee101948b78c1e32)

Review URL: https://codereview.chromium.org/967773002
core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
core/src/fpdfapi/fpdf_render/render_int.h