Undo the fix from commit 870b5b67.
This patch from 4 years ago no longer seems necessary. Likely
libopenjpeg updates introduced a proper fix for this.
Bug: pdfium:71,pdfium:168
Change-Id: I0c90c7a8c4c56ff0dc7627ee49cc220f16676606
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/60575
Reviewed-by: Nicolás Peña Moreno <npm@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxcodec/jpx/cjpx_decoder.cpp b/core/fxcodec/jpx/cjpx_decoder.cpp
index 6e8ba7a..f865d38 100644
--- a/core/fxcodec/jpx/cjpx_decoder.cpp
+++ b/core/fxcodec/jpx/cjpx_decoder.cpp
@@ -441,9 +441,6 @@
return false;
m_Image = pTempImage;
-#if !defined(USE_SYSTEM_LIBOPENJPEG2)
- m_Image->pdfium_use_colorspace = (m_ColorSpaceOption != kNoColorSpace);
-#endif
return true;
}
diff --git a/third_party/libopenjpeg20/0000-use-colorspace.patch b/third_party/libopenjpeg20/0000-use-colorspace.patch
deleted file mode 100644
index 4d89eff..0000000
--- a/third_party/libopenjpeg20/0000-use-colorspace.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c
-index f3ccb9974..882f1b649 100644
---- a/third_party/libopenjpeg20/jp2.c
-+++ b/third_party/libopenjpeg20/jp2.c
-@@ -1624,7 +1624,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) {
- if (!opj_jp2_apply_pclr(p_image, &(jp2->color), p_manager)) {
- return OPJ_FALSE;
- }
-diff --git a/third_party/libopenjpeg20/openjpeg.h b/third_party/libopenjpeg20/openjpeg.h
-index d571c516e..e8dbe4ff7 100644
---- a/third_party/libopenjpeg20/openjpeg.h
-+++ b/third_party/libopenjpeg20/openjpeg.h
-@@ -682,6 +682,10 @@ typedef struct opj_image {
- OPJ_BYTE *icc_profile_buf;
- /** size of ICC profile */
- OPJ_UINT32 icc_profile_len;
-+
-+
-+ /** Whether to apply PCLR or not */
-+ OPJ_BOOL pdfium_use_colorspace;
- } opj_image_t;
-
-
diff --git a/third_party/libopenjpeg20/README.pdfium b/third_party/libopenjpeg20/README.pdfium
index 45d8bec..e812f13 100644
--- a/third_party/libopenjpeg20/README.pdfium
+++ b/third_party/libopenjpeg20/README.pdfium
@@ -9,7 +9,6 @@
Local Modifications:
-0000-use-colorspace.patch: Makes it possible to not call opj_jp2_apply_pclr().
0003-dwt-decode.patch: Check array bounds for opj_dwt_decode_1() and friends.
0005-jp2_apply_pclr.patch: Fix out of bounds access.
0006-tcd_init_tile.patch: Fix a divide by zero bug in opj_tcd_init_tile().
diff --git a/third_party/libopenjpeg20/jp2.c b/third_party/libopenjpeg20/jp2.c
index ea67b98..1f61a23 100644
--- a/third_party/libopenjpeg20/jp2.c
+++ b/third_party/libopenjpeg20/jp2.c
@@ -1650,7 +1650,7 @@
/* Part 1, I.5.3.4: Either both or none : */
if (!jp2->color.jp2_pclr->cmap) {
opj_jp2_free_pclr(&(jp2->color));
- } else if (p_image->pdfium_use_colorspace) {
+ } else {
if (!opj_jp2_apply_pclr(p_image, &(jp2->color), p_manager)) {
return OPJ_FALSE;
}
diff --git a/third_party/libopenjpeg20/openjpeg.h b/third_party/libopenjpeg20/openjpeg.h
index f051b58..53a0e10 100644
--- a/third_party/libopenjpeg20/openjpeg.h
+++ b/third_party/libopenjpeg20/openjpeg.h
@@ -685,10 +685,6 @@
OPJ_BYTE *icc_profile_buf;
/** size of ICC profile */
OPJ_UINT32 icc_profile_len;
-
-
- /** Whether to apply PCLR or not */
- OPJ_BOOL pdfium_use_colorspace;
} opj_image_t;
