Merge to M46: upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/cio.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 28 matching lines @@
 
 #include "opj_includes.h"
 
 /* ----------------------------------------------------------------------- */
 
 
 /* ----------------------------------------------------------------------- */
 
 void opj_write_bytes_BE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes)
 {
-        const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value) + p_nb_bytes;
+        const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value)+sizeof(OPJ_UINT32)-p_nb_bytes;
 
         assert(p_nb_bytes > 0 && p_nb_bytes <=  sizeof(OPJ_UINT32));
 
         memcpy(p_buffer,l_data_ptr,p_nb_bytes);
 }
 
 void opj_write_bytes_LE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes)
 {
         const OPJ_BYTE * l_data_ptr = ((const OPJ_BYTE *) &p_value) + p_nb_bytes - 1;
         OPJ_UINT32 i;
 
         assert(p_nb_bytes > 0 && p_nb_bytes <= sizeof(OPJ_UINT32));
 
         for     (i=0;i<p_nb_bytes;++i) {
                 *(p_buffer++) = *(l_data_ptr--);
         }
 }
 
 void opj_read_bytes_BE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes)
 {
         OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value);
 
         assert(p_nb_bytes > 0 && p_nb_bytes <= sizeof(OPJ_UINT32));
 
         *p_value = 0;
-        memcpy(l_data_ptr+4-p_nb_bytes,p_buffer,p_nb_bytes);
+        memcpy(l_data_ptr+sizeof(OPJ_UINT32)-p_nb_bytes,p_buffer,p_nb_bytes);
 }
 
 void opj_read_bytes_LE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes)
 {
         OPJ_BYTE * l_data_ptr = ((OPJ_BYTE *) p_value) + p_nb_bytes-1;
         OPJ_UINT32 i;
 
         assert(p_nb_bytes > 0 && p_nb_bytes <= sizeof(OPJ_UINT32));
 
         *p_value = 0;
@@ skipping 209 matching lines @@
                 p_stream->m_byte_offset += (OPJ_OFF_T)p_stream->m_bytes_in_buffer;
                 p_stream->m_bytes_in_buffer = 0;
         }
         else {
     /* case where we are already at the end of the buffer
        so reset the m_current_data to point to the start of the
        stored buffer to get ready to read from disk*/
                 p_stream->m_current_data = p_stream->m_stored_data;
         }
 
-        while(1){
+        for (;;) {
                 /* we should read less than a chunk -> read a chunk */
                 if (p_size < p_stream->m_buffer_size) {
                         /* we should do an actual read on the media */
                         p_stream->m_bytes_in_buffer = p_stream->m_read_fn(p_stream->m_stored_data,p_stream->m_buffer_size,p_stream->m_user_data);
 
                         if (p_stream->m_bytes_in_buffer == (OPJ_SIZE_T)-1) {
                                 /* end of stream */
                                 opj_event_msg(p_event_mgr, EVT_INFO, "Stream reached its end !\n");
 
                                 p_stream->m_bytes_in_buffer = 0;
@@ skipping 59 matching lines @@
                                                                   OPJ_SIZE_T p_size, 
                                                                   opj_event_mgr_t * p_event_mgr)
 {
         OPJ_SIZE_T l_remaining_bytes = 0;
         OPJ_SIZE_T l_write_nb_bytes = 0;
 
         if (p_stream->m_status & opj_stream_e_error) {
                 return (OPJ_SIZE_T)-1;
         }
 
-        while(1) {
+        for (;;) {
                 l_remaining_bytes = p_stream->m_buffer_size - p_stream->m_bytes_in_buffer;
                 
                 /* we have more memory than required */
                 if (l_remaining_bytes >= p_size) {
                         memcpy(p_stream->m_current_data, p_buffer, p_size);
                         
                         p_stream->m_current_data += p_size;
                         p_stream->m_bytes_in_buffer += p_size;
                         l_write_nb_bytes += p_size;
                         p_stream->m_byte_offset += (OPJ_OFF_T)p_size;
@@ skipping 239 matching lines @@
         OPJ_ARG_NOT_USED(p_user_data);
         return (OPJ_OFF_T) -1;
 }
 
 OPJ_BOOL opj_stream_default_seek (OPJ_OFF_T p_nb_bytes, void * p_user_data)
 {
         OPJ_ARG_NOT_USED(p_nb_bytes);
         OPJ_ARG_NOT_USED(p_user_data);
         return OPJ_FALSE;
 }