diff options
| author | Chris Palmer <palmer@chromium.org> | 2017-09-11 11:13:24 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-09-11 18:54:49 +0000 |
| commit | 56ec0818c3ed195c8de2daba951ddbcb4dc7d7bc (patch) | |
| tree | 35b2a07f945e450feffc2d2d06d292ede23589f0 /core/fxcodec/codec/fx_codec_jpx_unittest.cpp | |
| parent | 131c0eb2e34ece6ede6288842cb3004ec3c600d4 (diff) | |
| download | pdfium-56ec0818c3ed195c8de2daba951ddbcb4dc7d7bc.tar.xz | |
Use the right allocate and free functions in OpenJPEG.
This patch was authored by Ke Liu of Tencent's Xuanwu Lab.
BUG=762374
Change-Id: Icb3ee98fb4c399b871ccf11e9920af7caf51be11
Reviewed-on: https://pdfium-review.googlesource.com/13610
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Chris Palmer <palmer@chromium.org>
Diffstat (limited to 'core/fxcodec/codec/fx_codec_jpx_unittest.cpp')
| -rw-r--r-- | core/fxcodec/codec/fx_codec_jpx_unittest.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/core/fxcodec/codec/fx_codec_jpx_unittest.cpp b/core/fxcodec/codec/fx_codec_jpx_unittest.cpp index cc5c8601b1..c1b20513cd 100644 --- a/core/fxcodec/codec/fx_codec_jpx_unittest.cpp +++ b/core/fxcodec/codec/fx_codec_jpx_unittest.cpp @@ -436,9 +436,12 @@ TEST(fxcodec, YUV420ToRGB) { y.h = y.w; img.x1 = y.w; img.y1 = y.h; - y.data = static_cast<OPJ_INT32*>(opj_calloc(y.w * y.h, sizeof(OPJ_INT32))); - v.data = static_cast<OPJ_INT32*>(opj_calloc(v.w * v.h, sizeof(OPJ_INT32))); - u.data = static_cast<OPJ_INT32*>(opj_calloc(u.w * u.h, sizeof(OPJ_INT32))); + y.data = static_cast<OPJ_INT32*>( + opj_image_data_alloc(y.w * y.h * sizeof(OPJ_INT32))); + v.data = static_cast<OPJ_INT32*>( + opj_image_data_alloc(v.w * v.h * sizeof(OPJ_INT32))); + u.data = static_cast<OPJ_INT32*>( + opj_image_data_alloc(u.w * u.h * sizeof(OPJ_INT32))); memset(y.data, 1, y.w * y.h * sizeof(OPJ_INT32)); memset(u.data, 0, u.w * u.h * sizeof(OPJ_INT32)); memset(v.data, 0, v.w * v.h * sizeof(OPJ_INT32)); @@ -457,9 +460,9 @@ TEST(fxcodec, YUV420ToRGB) { EXPECT_NE(img.comps[0].w, img.comps[2].w); EXPECT_NE(img.comps[0].h, img.comps[2].h); } - opj_free(img.comps[0].data); - opj_free(img.comps[1].data); - opj_free(img.comps[2].data); + opj_image_data_free(img.comps[0].data); + opj_image_data_free(img.comps[1].data); + opj_image_data_free(img.comps[2].data); } FX_Free(img.comps); } |