Reapply Foxit's libopenjpeg modifications.

third_party/libopenjpeg20/jp2.c

 /*
  * The copyright in this software is being made available under the 2-clauses 
  * BSD License, included below. This software may be subject to other third 
  * party and contributor rights, including patent rights, and no such rights
  * are granted under this license.
  *
  * Copyright (c) 2002-2014, Universite catholique de Louvain (UCL), Belgium
  * Copyright (c) 2002-2014, Professor Benoit Macq
  * Copyright (c) 2001-2003, David Janssens
  * Copyright (c) 2002-2003, Yannick Verschueren
@@ skipping 1411 matching lines @@
                     p_image->color_space = OPJ_CLRSPC_SYCC;
             else if (jp2->enumcs == 24)
                     p_image->color_space = OPJ_CLRSPC_EYCC;
             else
                     p_image->color_space = OPJ_CLRSPC_UNKNOWN;
 
             if(jp2->color.jp2_pclr) {
                     /* 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)
                             opj_jp2_apply_pclr(p_image, &(jp2->color));
             }
 
             /* Apply the color space if needed */
             if(jp2->color.jp2_cdef) {
                     opj_jp2_apply_cdef(p_image, &(jp2->color));
             }
 
             if(jp2->color.icc_profile_buf) {
                     p_image->icc_profile_buf = jp2->color.icc_profile_buf;
@@ skipping 1548 matching lines @@
   len = opj_stream_tell(cio)-lenp;
   opj_stream_skip(cio, lenp, p_manager);
   opj_write_bytes(l_data_header,len,4);/* L              */
   opj_stream_write_data(cio,l_data_header,4,p_manager);
   opj_stream_seek(cio, lenp+len,p_manager);
 
   return len;
 }
 #endif
 #endif /* USE_JPIP */