Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1069)

Unified Diff: third_party/libopenjpeg20/jp2.c

Issue 1196523002: Reapply Foxit's libopenjpeg modifications. (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: with test Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/libopenjpeg20/README.pdfium ('k') | third_party/libopenjpeg20/openjpeg.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libopenjpeg20/jp2.c
diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c
index aafbe199d6f55d36a39d7e3d352470310bbf1dd6..08b195304d1f443b85dadbcc55c992c9d0e86d56 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));
}
« no previous file with comments | « third_party/libopenjpeg20/README.pdfium ('k') | third_party/libopenjpeg20/openjpeg.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698