Merge to M46: upgrade openjpeg to commit# cf352af

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 637 matching lines @@
     FX_Free(src2);
     image->color_space = OPJ_CLRSPC_SRGB;
     image->comps[0].prec = 16;
     image->comps[1].prec = 16;
     image->comps[2].prec = 16;
     return;
   }
 }
 class CJPX_Decoder {
  public:
-  CJPX_Decoder();
+  explicit CJPX_Decoder(bool use_colorspace);
   ~CJPX_Decoder();
   FX_BOOL Init(const unsigned char* src_data, int src_size);
   void GetInfo(FX_DWORD& width,
                FX_DWORD& height,
                FX_DWORD& codestream_nComps,
                FX_DWORD& output_nComps);
   FX_BOOL Decode(uint8_t* dest_buf,
                  int pitch,
                  FX_BOOL bTranslateColor,
                  uint8_t* offsets);
   const uint8_t* m_SrcData;
   int m_SrcSize;
   opj_image_t* image;
   opj_codec_t* l_codec;
   opj_stream_t* l_stream;
-  FX_BOOL m_useColorSpace;
+  const bool m_UseColorSpace;
 };
-CJPX_Decoder::CJPX_Decoder()
-    : image(NULL), l_codec(NULL), l_stream(NULL), m_useColorSpace(FALSE) {}
+CJPX_Decoder::CJPX_Decoder(bool use_colorspace)
+    : image(NULL), l_codec(NULL), l_stream(NULL), m_UseColorSpace(use_colorspace) {}
 CJPX_Decoder::~CJPX_Decoder() {
   if (l_codec) {
     opj_destroy_codec(l_codec);
   }
   if (l_stream) {
     opj_stream_destroy(l_stream);
   }
   if (image) {
     opj_image_destroy(image);
   }
@@ skipping 29 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 120 matching lines @@
   FX_Free(adjust_comps);
   return result;
 }
 void initialize_transition_table();
 void initialize_significance_luts();
 void initialize_sign_lut();
 CCodec_JpxModule::CCodec_JpxModule() {}
 void* CCodec_JpxModule::CreateDecoder(const uint8_t* src_buf,
                                       FX_DWORD src_size,
                                       FX_BOOL useColorSpace) {
-  CJPX_Decoder* pDecoder = new CJPX_Decoder;
-  pDecoder->m_useColorSpace = useColorSpace;
+  CJPX_Decoder* pDecoder = new CJPX_Decoder(useColorSpace);
   if (!pDecoder->Init(src_buf, src_size)) {
     delete pDecoder;
     return NULL;
   }
   return pDecoder;
 }
 void CCodec_JpxModule::GetImageInfo(void* ctx,
                                     FX_DWORD& width,
                                     FX_DWORD& height,
                                     FX_DWORD& codestream_nComps,
                                     FX_DWORD& output_nComps) {
   CJPX_Decoder* pDecoder = (CJPX_Decoder*)ctx;
   pDecoder->GetInfo(width, height, codestream_nComps, output_nComps);
 }
 FX_BOOL CCodec_JpxModule::Decode(void* ctx,
                                  uint8_t* dest_data,
                                  int pitch,
                                  FX_BOOL bTranslateColor,
                                  uint8_t* offsets) {
   CJPX_Decoder* pDecoder = (CJPX_Decoder*)ctx;
   return pDecoder->Decode(dest_data, pitch, bTranslateColor, offsets);
 }
 void CCodec_JpxModule::DestroyDecoder(void* ctx) {
   CJPX_Decoder* pDecoder = (CJPX_Decoder*)ctx;
   delete pDecoder;
 }