Revert "Do not use strict mode when decoding JPEG2000 images"
This reverts commit e97ee6e258c4657747070c876a51206312347e9b.
Reason for revert: Caused decoding problems in OpenJPEG.
Original change's description:
> Do not use strict mode when decoding JPEG2000 images
>
> Acrobat Reader can render the PDF attached to the bug report, while
> PDFium cannot. This is because PDFium uses libopenjpeg, and in the past
> libopenjpeg only had strict mode, which rejects the image in the PDF and
> refuses to do partial rendering. Now opj_decoder_set_strict_mode()
> exists in libopenjpeg. Use it to unset strict mode, so PDFium can render
> the PDF in the bug report in the same way as Acrobat Reader.
>
> Bug: 42270564
> Change-Id: I77b1f73659d48252d488a4a1bd170cce20017aff
> Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/119592
> Reviewed-by: Tom Sepez <tsepez@chromium.org>
> Reviewed-by: Thomas Sepez <tsepez@google.com>
> Commit-Queue: Lei Zhang <thestig@chromium.org>
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 42270564, 348129258
Change-Id: I5a6cff61c89e56bce79365fd6aeeeb12756fc724
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/120793
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Thomas Sepez <tsepez@google.com>
diff --git a/core/fxcodec/jpx/cjpx_decoder.cpp b/core/fxcodec/jpx/cjpx_decoder.cpp
index 5156283..b1ca859 100644
--- a/core/fxcodec/jpx/cjpx_decoder.cpp
+++ b/core/fxcodec/jpx/cjpx_decoder.cpp
@@ -15,7 +15,6 @@
#include <vector>
#include "core/fxcodec/jpx/jpx_decode_utils.h"
-#include "core/fxcrt/check.h"
#include "core/fxcrt/fx_safe_types.h"
#include "core/fxcrt/numerics/safe_conversions.h"
#include "core/fxcrt/ptr_util.h"
@@ -469,9 +468,6 @@
return false;
}
- // For https://crbug.com/42270564
- CHECK(opj_decoder_set_strict_mode(m_Codec.get(), false));
-
opj_image_t* pTempImage = nullptr;
if (!opj_read_header(m_Stream.get(), m_Codec.get(), &pTempImage)) {
return false;
