diff --git a/Utilities/otbopenjpeg/libopenjpeg/openjpeg.h b/Utilities/otbopenjpeg/libopenjpeg/openjpeg.h index 8665981da51b17c67e71557624941099bdb717d0..78601788be2c85036f8994d74c5e0c2638e83700 100644 --- a/Utilities/otbopenjpeg/libopenjpeg/openjpeg.h +++ b/Utilities/otbopenjpeg/libopenjpeg/openjpeg.h @@ -1492,8 +1492,9 @@ OPJ_API opj_jp2_metadata_t* OPJ_CALLCONV opj_get_jp2_metadata(opj_codec_t *p_cod OPJ_API opj_jp2_index_t* OPJ_CALLCONV opj_get_jp2_index(opj_codec_t *p_codec); +OPJ_API opj_image_t* OPJ_CALLCONV opj_image_create0(); - +OPJ_API void opj_copy_image_header(const opj_image_t* p_image_src, opj_image_t* p_image_dest); #ifdef __cplusplus } diff --git a/Utilities/otbopenjpeg/openjpeg_mangle.h.cmake.in b/Utilities/otbopenjpeg/openjpeg_mangle.h.cmake.in index d578dc7cea76577084f04f1947b2dd3bfc03c261..b983baf7f21cdb98b0d821b8f5e3d6f368dc5ca3 100644 --- a/Utilities/otbopenjpeg/openjpeg_mangle.h.cmake.in +++ b/Utilities/otbopenjpeg/openjpeg_mangle.h.cmake.in @@ -39,8 +39,9 @@ #define opj_destroy_decompress @OPJ_MANGLE_PREFIX@_opj_destroy_decompress #define opj_image_create @OPJ_MANGLE_PREFIX@_opj_image_create +#define opj_image_create0 @OPJ_MANGLE_PREFIX@_opj_image_create0 #define opj_image_destroy @OPJ_MANGLE_PREFIX@_opj_image_destroy - +#define opj_copy_image_header @OPJ_MANGLE_PREFIX@_opj_copy_image_header #define opj_set_default_decoder_parameters @OPJ_MANGLE_PREFIX@_opj_set_default_decoder_parameters #define opj_set_default_encoder_parameters @OPJ_MANGLE_PREFIX@_opj_set_default_encoder_parameters @@ -88,4 +89,4 @@ #endif -#endif \ No newline at end of file +#endif diff --git a/Utilities/otbopenjpeg/openjpeg_mangle_private.h.cmake.in b/Utilities/otbopenjpeg/openjpeg_mangle_private.h.cmake.in index 3d9e796785232eb3666737ee99a9cd1e9c228ae4..c0f251148d42460a7f61b9544fe625fc131a96a0 100644 --- a/Utilities/otbopenjpeg/openjpeg_mangle_private.h.cmake.in +++ b/Utilities/otbopenjpeg/openjpeg_mangle_private.h.cmake.in @@ -64,13 +64,11 @@ #define jp2_setup_decoder_v2 @OPJ_MANGLE_PREFIX@_jp2_setup_decoder_v2 #define mct_decode_custom @OPJ_MANGLE_PREFIX@_mct_decode_custom #define opj_clock @OPJ_MANGLE_PREFIX@_opj_clock -#define opj_copy_image_header @OPJ_MANGLE_PREFIX@_opj_copy_image_header #define opj_error_default_callback @OPJ_MANGLE_PREFIX@_opj_error_default_callback #define opj_event_msg @OPJ_MANGLE_PREFIX@_opj_event_msg #define opj_event_msg_v2 @OPJ_MANGLE_PREFIX@_opj_event_msg_v2 #define opj_get_data_length_from_file @OPJ_MANGLE_PREFIX@_opj_get_data_length_from_file #define opj_image_comp_header_update @OPJ_MANGLE_PREFIX@_opj_image_comp_header_update -#define opj_image_create0 @OPJ_MANGLE_PREFIX@_opj_image_create0 #define opj_info_default_callback @OPJ_MANGLE_PREFIX@_opj_info_default_callback #define opj_jp2_decode @OPJ_MANGLE_PREFIX@_opj_jp2_decode #define opj_jp2_encode @OPJ_MANGLE_PREFIX@_opj_jp2_encode @@ -278,4 +276,4 @@ #endif -#endif \ No newline at end of file +#endif