Reapply Foxit's libopenjpeg modifications.

core/src/fxcodec/codec/fx_codec_jpx_opj.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include <algorithm>
 #include <limits>
 
 #include "../../../../third_party/lcms2-2.6/include/lcms2.h"
@@ skipping 609 matching lines @@
   FX_BOOL Decode(uint8_t* dest_buf,
                  int pitch,
                  uint8_t* offsets);
 
  private:
   const uint8_t* m_SrcData;
   int m_SrcSize;
   opj_image_t* image;
   opj_codec_t* l_codec;
   opj_stream_t* l_stream;
-  bool m_UseColorSpace;
+  const bool m_UseColorSpace;
 };
 
 CJPX_Decoder::CJPX_Decoder(bool use_colorspace)
     : image(nullptr),
       l_codec(nullptr),
       l_stream(nullptr),
       m_UseColorSpace(use_colorspace) {
 }
 
 CJPX_Decoder::~CJPX_Decoder() {
@@ skipping 39 matching lines @@
   opj_set_info_handler(l_codec, fx_info_callback, 00);
   opj_set_warning_handler(l_codec, fx_warning_callback, 00);
   opj_set_error_handler(l_codec, fx_error_callback, 00);
   if (!opj_setup_decoder(l_codec, &parameters)) {
     return FALSE;
   }
   if (!opj_read_header(l_stream, l_codec, &image)) {
     image = NULL;
     return FALSE;
   }
+  image->pdfium_use_colorspace = m_UseColorSpace;
+
   if (!parameters.nb_tile_to_decode) {
     if (!opj_set_decode_area(l_codec, image, parameters.DA_x0, parameters.DA_y0,
                              parameters.DA_x1, parameters.DA_y1)) {
       opj_image_destroy(image);
       image = NULL;
       return FALSE;
     }
     if (!(opj_decode(l_codec, l_stream, image) &&
           opj_end_decompress(l_codec, l_stream))) {
       opj_image_destroy(image);
@@ skipping 142 matching lines @@
 FX_BOOL CCodec_JpxModule::Decode(CJPX_Decoder* pDecoder,
                                  uint8_t* dest_data,
                                  int pitch,
                                  uint8_t* offsets) {
   return pDecoder->Decode(dest_data, pitch, offsets);
 }
 
 void CCodec_JpxModule::DestroyDecoder(CJPX_Decoder* pDecoder) {
   delete pDecoder;
 }