tree c9f675311e408996e12059c0f7d530d2b67a66c7
parent 3f753f20e9c51f7170a616a355b3f9578505c0ee
author Dan Sinclair <dsinclair@chromium.org> 1503337472 -0400
committer Chromium commit bot <commit-bot@chromium.org> 1503338926 +0000

[Merge M61] Fix PartitionAlloc vs. opj_malloc mismatch in fx_codec_jpx_opj.cpp

Apply patch suggestions from reporter. Move all FX_Alloc'd memory
into unique_ptrs so that no bare FX_Alloc/Free_Free calls remain.
Fix a realloc / opj_realloc mismatch. Remove unused functions
color_apply_icc_profile() and color_apply_conversion(). Tidy along
the way, add some missing statics, and fix a confusing (but not quite
member shadowing) local name.

Bug: 752829
Change-Id: Ibf2d108a857e3de39e752c2c553a31e002a07caf
Reviewed-on: https://pdfium-review.googlesource.com/10230
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Chris Palmer <palmer@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
(cherry picked from commit ae6c3444c268076a234b567c5d43f0b5363ae66a)
Reviewed-on: https://pdfium-review.googlesource.com/11510
Reviewed-by: dsinclair <dsinclair@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>