Merge to M46: upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/cio.h

 /*
  * 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 166 matching lines @@
  * @param p_value               the value to write
  * @param p_nb_bytes    the number of bytes to write
 */
 void opj_write_bytes_BE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes);
 
 /**
  * Reads some bytes from the given data buffer, this function is used in Big Endian cpus.
  * @param p_buffer              pointer the data buffer to read data from.
  * @param p_value               pointer to the value that will store the data.
  * @param p_nb_bytes    the nb bytes to read.
- * @return                              the number of bytes read or -1 if an error occured.
+ * @return                              the number of bytes read or -1 if an error occurred.
  */
 void opj_read_bytes_BE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes);
 
 /**
  * Write some bytes to the given data buffer, this function is used in Little Endian cpus.
  * @param p_buffer              pointer the data buffer to write data to.
  * @param p_value               the value to write
  * @param p_nb_bytes    the number of bytes to write
- * @return                              the number of bytes written or -1 if an error occured
+ * @return                              the number of bytes written or -1 if an error occurred
 */
 void opj_write_bytes_LE (OPJ_BYTE * p_buffer, OPJ_UINT32 p_value, OPJ_UINT32 p_nb_bytes);
 
 /**
  * Reads some bytes from the given data buffer, this function is used in Little Endian cpus.
  * @param p_buffer              pointer the data buffer to read data from.
  * @param p_value               pointer to the value that will store the data.
  * @param p_nb_bytes    the nb bytes to read.
- * @return                              the number of bytes read or -1 if an error occured.
+ * @return                              the number of bytes read or -1 if an error occurred.
  */
 void opj_read_bytes_LE(const OPJ_BYTE * p_buffer, OPJ_UINT32 * p_value, OPJ_UINT32 p_nb_bytes);
 
 
 /**
  * Write some bytes to the given data buffer, this function is used in Little Endian cpus.
  * @param p_buffer              pointer the data buffer to write data to.
  * @param p_value               the value to write
  */
 void opj_write_double_LE(OPJ_BYTE * p_buffer, OPJ_FLOAT64 p_value);
@@ skipping 46 matching lines @@
  * @param p_value               the value to write
  */
 void opj_write_float_BE(OPJ_BYTE * p_buffer, OPJ_FLOAT32 p_value);
 
 /**
  * Reads some bytes from the stream.
  * @param               p_stream        the stream to read data from.
  * @param               p_buffer        pointer to the data buffer that will receive the data.
  * @param               p_size          number of bytes to read.
  * @param               p_event_mgr     the user event manager to be notified of special events.
- * @return              the number of bytes read, or -1 if an error occured or if the stream is at the end.
+ * @return              the number of bytes read, or -1 if an error occurred or if the stream is at the end.
  */
 OPJ_SIZE_T opj_stream_read_data (opj_stream_private_t * p_stream,OPJ_BYTE * p_buffer, OPJ_SIZE_T p_size, struct opj_event_mgr * p_event_mgr);
 
 /**
  * Writes some bytes to the stream.
  * @param               p_stream        the stream to write data to.
  * @param               p_buffer        pointer to the data buffer holds the data to be writtent.
  * @param               p_size          number of bytes to write.
  * @param               p_event_mgr     the user event manager to be notified of special events.
- * @return              the number of bytes writtent, or -1 if an error occured.
+ * @return              the number of bytes writtent, or -1 if an error occurred.
  */
 OPJ_SIZE_T opj_stream_write_data (opj_stream_private_t * p_stream,const OPJ_BYTE * p_buffer, OPJ_SIZE_T p_size, struct opj_event_mgr * p_event_mgr);
 
 /**
  * Writes the content of the stream buffer to the stream.
  * @param               p_stream        the stream to write data to.
  * @param               p_event_mgr     the user event manager to be notified of special events.
  * @return              true if the data could be flushed, false else.
  */
 OPJ_BOOL opj_stream_flush (opj_stream_private_t * p_stream, struct opj_event_mgr * p_event_mgr);
 
 /**
  * Skips a number of bytes from the stream.
  * @param               p_stream        the stream to skip data from.
  * @param               p_size          the number of bytes to skip.
  * @param               p_event_mgr     the user event manager to be notified of special events.
- * @return              the number of bytes skipped, or -1 if an error occured.
+ * @return              the number of bytes skipped, or -1 if an error occurred.
  */
 OPJ_OFF_T opj_stream_skip (opj_stream_private_t * p_stream,OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
 
 /**
  * Tells the byte offset on the stream (similar to ftell).
  *
  * @param               p_stream        the stream to get the information from.
  *
  * @return              the current position o fthe stream.
  */
 OPJ_OFF_T opj_stream_tell (const opj_stream_private_t * p_stream);
 
 
 /**
  * Get the number of bytes left before the end of the stream (similar to cio_numbytesleft).
  *
  * @param               p_stream        the stream to get the information from.
  *
  * @return              Number of bytes left before the end of the stream.
  */
 OPJ_OFF_T opj_stream_get_number_byte_left (const opj_stream_private_t * p_stream);
 
 /**
  * Skips a number of bytes from the stream.
  * @param               p_stream        the stream to skip data from.
  * @param               p_size          the number of bytes to skip.
  * @param               p_event_mgr     the user event manager to be notified of special events.
- * @return              the number of bytes skipped, or -1 if an error occured.
+ * @return              the number of bytes skipped, or -1 if an error occurred.
  */
 OPJ_OFF_T opj_stream_write_skip (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
 
 /**
  * Skips a number of bytes from the stream.
  * @param               p_stream        the stream to skip data from.
  * @param               p_size          the number of bytes to skip.
  * @param               p_event_mgr     the user event manager to be notified of special events.
- * @return              the number of bytes skipped, or -1 if an error occured.
+ * @return              the number of bytes skipped, or -1 if an error occurred.
  */
 OPJ_OFF_T opj_stream_read_skip (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
 
 /**
  * Skips a number of bytes from the stream.
  * @param               p_stream        the stream to skip data from.
  * @param               p_size          the number of bytes to skip.
  * @param               p_event_mgr     the user event manager to be notified of special events.
- * @return              OPJ_TRUE if success, or OPJ_FALSE if an error occured.
+ * @return              OPJ_TRUE if success, or OPJ_FALSE if an error occurred.
  */
 OPJ_BOOL opj_stream_read_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
 
 /**
  * Skips a number of bytes from the stream.
  * @param               p_stream        the stream to skip data from.
  * @param               p_size          the number of bytes to skip.
  * @param               p_event_mgr     the user event manager to be notified of special events.
- * @return              the number of bytes skipped, or -1 if an error occured.
+ * @return              the number of bytes skipped, or -1 if an error occurred.
  */
 OPJ_BOOL opj_stream_write_seek (opj_stream_private_t * p_stream, OPJ_OFF_T p_size, struct opj_event_mgr * p_event_mgr);
 
 /**
  * Seeks a number of bytes from the stream.
  * @param               p_stream        the stream to skip data from.
  * @param               p_size          the number of bytes to skip.
  * @param               p_event_mgr     the user event manager to be notified of special events.
  * @return              true if the stream is seekable.
  */
@@ skipping 25 matching lines @@
 OPJ_BOOL opj_stream_default_seek (OPJ_OFF_T p_nb_bytes, void * p_user_data);
 
 /* ----------------------------------------------------------------------- */
 /*@}*/
 
 /*@}*/
 
 
 #endif /* __CIO_H */