From 55512706477c035ee27413a7a2c9a75f31ceae34 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Thu, 3 Sep 2015 14:44:16 -0700 Subject: Merge to XFA: Reapply Foxit's libopenjpeg modifications. They were lost in commit d53e6fd. BUG=pdfium:168 TBR=tsepez@chromium.org Review URL: https://codereview.chromium.org/1196523002 . (cherry picked from commit 870b5b6793fa261f0c6f31f026010d2d715968bf) Review URL: https://codereview.chromium.org/1301323007 . --- third_party/libopenjpeg20/jp2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/libopenjpeg20/jp2.c') diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c index aafbe199d6..08b195304d 100644 --- a/third_party/libopenjpeg20/jp2.c +++ b/third_party/libopenjpeg20/jp2.c @@ -1429,7 +1429,7 @@ OPJ_BOOL opj_jp2_decode(opj_jp2_t *jp2, /* Part 1, I.5.3.4: Either both or none : */ if( !jp2->color.jp2_pclr->cmap) opj_jp2_free_pclr(&(jp2->color)); - else + else if (p_image->pdfium_use_colorspace) opj_jp2_apply_pclr(p_image, &(jp2->color)); } -- cgit v1.2.3