Merge to M46: upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/openjpeg.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) 2005, Herve Drolon, FreeImage Team
  * Copyright (c) 2008, 2011-2012, Centre National d'Etudes Spatiales (CNES), FR 
  * Copyright (c) 2012, CS Systemes d'Information, France
  * All rights reserved.
@@ skipping 506 matching lines @@
 
         return OPJ_FALSE;
 }
 
 OPJ_BOOL OPJ_CALLCONV opj_set_decoded_resolution_factor(opj_codec_t *p_codec, 
                                                                                                                 OPJ_UINT32 res_factor )
 {
         opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec;
 
         if ( !l_codec ){
-                fprintf(stderr, "[ERROR] Input parameters of the setup_decoder function are incorrect.\n");
                 return OPJ_FALSE;
         }
 
-        l_codec->m_codec_data.m_decompression.opj_set_decoded_resolution_factor(l_codec->m_codec, 
+        return l_codec->m_codec_data.m_decompression.opj_set_decoded_resolution_factor(l_codec->m_codec,
                                                                                                                                                         res_factor,
                                                                                                                                                         &(l_codec->m_event_mgr) );
-        return OPJ_TRUE;
 }
 
 /* ---------------------------------------------------------------------- */
 /* COMPRESSION FUNCTIONS*/
 
 opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format)
 {
         opj_codec_private_t *l_codec = 00;
 
         l_codec = (opj_codec_private_t*)opj_calloc(1, sizeof(opj_codec_private_t));
@@ skipping 148 matching lines @@
 }
 
 OPJ_BOOL OPJ_CALLCONV opj_setup_encoder(opj_codec_t *p_codec, 
                                                                                 opj_cparameters_t *parameters, 
                                                                                 opj_image_t *p_image)
 {
         if (p_codec && parameters && p_image) {
                 opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec;
 
                 if (! l_codec->is_decompressor) {
-                        l_codec->m_codec_data.m_compression.opj_setup_encoder(  l_codec->m_codec,
+                        return l_codec->m_codec_data.m_compression.opj_setup_encoder(   l_codec->m_codec,
                                                                                                                                         parameters,
                                                                                                                                         p_image,
                                                                                                                                         &(l_codec->m_event_mgr) );
-                        return OPJ_TRUE;
                 }
         }
 
         return OPJ_FALSE;
 }
 
 OPJ_BOOL OPJ_CALLCONV opj_start_compress (      opj_codec_t *p_codec,
                                                                                         opj_image_t * p_image,
                                                                                         opj_stream_t *p_stream)
 {
@@ skipping 144 matching lines @@
                                                                         OPJ_INT32 info_flag,
                                                                         FILE* output_stream)
 {
         if (p_codec) {
                 opj_codec_private_t* l_codec = (opj_codec_private_t*) p_codec;
 
                 l_codec->opj_dump_codec(l_codec->m_codec, info_flag, output_stream);
                 return;
         }
 
-        fprintf(stderr, "[ERROR] Input parameter of the dump_codec function are incorrect.\n");
+        /* TODO return error */
+        /* fprintf(stderr, "[ERROR] Input parameter of the dump_codec function are incorrect.\n"); */
         return;
 }
 
 opj_codestream_info_v2_t* OPJ_CALLCONV opj_get_cstr_info(opj_codec_t *p_codec)
 {
         if (p_codec) {
                 opj_codec_private_t* l_codec = (opj_codec_private_t*) p_codec;
 
                 return l_codec->opj_get_codec_info(l_codec->m_codec);
         }
@@ skipping 70 matching lines @@
 
     opj_stream_set_user_data(l_stream, p_file, (opj_stream_free_user_data_fn) fclose);
     opj_stream_set_user_data_length(l_stream, opj_get_data_length_from_file(p_file));
     opj_stream_set_read_function(l_stream, (opj_stream_read_fn) opj_read_from_file);
     opj_stream_set_write_function(l_stream, (opj_stream_write_fn) opj_write_from_file);
     opj_stream_set_skip_function(l_stream, (opj_stream_skip_fn) opj_skip_from_file);
     opj_stream_set_seek_function(l_stream, (opj_stream_seek_fn) opj_seek_from_file);
 
     return l_stream;
 }