Merge to M46: upgrade openjpeg to commit# cf352af

third_party/libopenjpeg20/jp2.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) 2002-2003, Yannick Verschueren
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
@@ skipping 72 matching lines @@
 JP2_STATE;
 
 typedef enum
 {
   JP2_IMG_STATE_NONE        = 0x0,
   JP2_IMG_STATE_UNKNOWN     = 0x7fffffff
 }
 JP2_IMG_STATE;
 
 /** 
-Channel description: channel index, type, assocation
+Channel description: channel index, type, association
 */
 typedef struct opj_jp2_cdef_info
 {
     OPJ_UINT16 cn, typ, asoc;
 } opj_jp2_cdef_info_t;
 
 /** 
 Channel descriptions and number of descriptions
 */
 typedef struct opj_jp2_cdef
@@ skipping 125 matching lines @@
   /* size of data */
   OPJ_UINT32  m_size;
 } 
 opj_jp2_img_header_writer_handler_t;
 
 /** @name Exported functions */
 /*@{*/
 /* ----------------------------------------------------------------------- */
 
 /**
- * Writes the Jpeg2000 file Header box - JP2 Header box (warning, this is a super box).
- *
- * @param  jp2      the jpeg2000 file codec.
- * @param  stream      the stream to write data to.
- * @param  p_manager  user event manager.
- *
- * @return true if writing was successful.
-*/
-OPJ_BOOL opj_jp2_write_jp2h(opj_jp2_t *jp2,
-                            opj_stream_private_t *stream,
-                            opj_event_mgr_t * p_manager );
-
-/**
 Setup the decoder decoding parameters using user parameters.
 Decoding parameters are returned in jp2->j2k->cp.
 @param jp2 JP2 decompressor handle
 @param parameters decompression parameters
 */
 void opj_jp2_setup_decoder(opj_jp2_t *jp2, opj_dparameters_t *parameters);
 
 /**
  * Decode an image from a JPEG-2000 file stream
  * @param jp2 JP2 decompressor handle
@@ skipping 225 matching lines @@
  */
 opj_codestream_index_t* jp2_get_cstr_index(opj_jp2_t* p_jp2);
 
 
 /*@}*/
 
 /*@}*/
 
 #endif /* __JP2_H */