Fix failed JPX image rendering

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 <vector>
 
 #include "codec_int.h"
+#include "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxcrt/fx_safe_types.h"
 #include "third_party/lcms2-2.6/include/lcms2.h"
 #include "third_party/libopenjpeg20/openjpeg.h"
 
 static void fx_error_callback(const char* msg, void* client_data) {
   (void)client_data;
 }
 static void fx_warning_callback(const char* msg, void* client_data) {
   (void)client_data;
@@ skipping 631 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:
-  explicit CJPX_Decoder(bool use_colorspace);
+  explicit CJPX_Decoder(CPDF_ColorSpace* cs);
   ~CJPX_Decoder();
   FX_BOOL Init(const unsigned char* src_data, FX_DWORD src_size);
   void GetInfo(FX_DWORD* width, FX_DWORD* height, FX_DWORD* components);
   bool Decode(uint8_t* dest_buf,
               int pitch,
               const std::vector<uint8_t>& offsets);
 
  private:
   const uint8_t* m_SrcData;
   FX_DWORD m_SrcSize;
   opj_image_t* image;
   opj_codec_t* l_codec;
   opj_stream_t* l_stream;
-  const bool m_UseColorSpace;
+  const CPDF_ColorSpace* const m_ColorSpace;
 };
 
-CJPX_Decoder::CJPX_Decoder(bool use_colorspace)
-    : image(nullptr),
-      l_codec(nullptr),
-      l_stream(nullptr),
-      m_UseColorSpace(use_colorspace) {
-}
+CJPX_Decoder::CJPX_Decoder(CPDF_ColorSpace* cs)
+    : image(nullptr), l_codec(nullptr), l_stream(nullptr), m_ColorSpace(cs) {}
 
 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 21 matching lines @@
   parameters.cod_format = 3;
   if (FXSYS_memcmp(m_SrcData, szJP2Header, sizeof(szJP2Header)) == 0) {
     l_codec = opj_create_decompress(OPJ_CODEC_JP2);
     parameters.decod_format = 1;
   } else {
     l_codec = opj_create_decompress(OPJ_CODEC_J2K);
   }
   if (!l_codec) {
     return FALSE;
   }
+  if (m_ColorSpace && m_ColorSpace->GetFamily() == PDFCS_INDEXED)
+    parameters.flags |= OPJ_DPARAMETERS_IGNORE_PCLR_CMAP_CDEF_FLAG;
   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;
+  image->pdfium_use_colorspace = !!m_ColorSpace;
 
   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))) {
@@ skipping 110 matching lines @@
   }
   return true;
 }
 
 CCodec_JpxModule::CCodec_JpxModule() {}
 CCodec_JpxModule::~CCodec_JpxModule() {
 }
 
 CJPX_Decoder* CCodec_JpxModule::CreateDecoder(const uint8_t* src_buf,
                                               FX_DWORD src_size,
-                                              bool use_colorspace) {
-  nonstd::unique_ptr<CJPX_Decoder> decoder(new CJPX_Decoder(use_colorspace));
+                                              CPDF_ColorSpace* cs) {
+  nonstd::unique_ptr<CJPX_Decoder> decoder(new CJPX_Decoder(cs));
   return decoder->Init(src_buf, src_size) ? decoder.release() : nullptr;
 }
 
 void CCodec_JpxModule::GetImageInfo(CJPX_Decoder* pDecoder,
                                     FX_DWORD* width,
                                     FX_DWORD* height,
                                     FX_DWORD* components) {
   pDecoder->GetInfo(width, height, components);
 }
 
 bool CCodec_JpxModule::Decode(CJPX_Decoder* pDecoder,
                               uint8_t* dest_data,
                               int pitch,
                               const std::vector<uint8_t>& offsets) {
   return pDecoder->Decode(dest_data, pitch, offsets);
 }
 
 void CCodec_JpxModule::DestroyDecoder(CJPX_Decoder* pDecoder) {
   delete pDecoder;
 }