Fix build issue of JPWL by adding opj_image_data_alloc() and opj_image_data_free() to src/lib/openmj2 (#994)

This commit is contained in:
Even Rouault 2017-08-16 17:38:47 +02:00
parent c535531f03
commit 1e387de742
2 changed files with 36 additions and 0 deletions

View File

@ -372,3 +372,18 @@ void OPJ_CALLCONV opj_destroy_cstr_info(opj_codestream_info_t *cstr_info)
opj_free(cstr_info->numdecompos); opj_free(cstr_info->numdecompos);
} }
} }
void* OPJ_CALLCONV opj_image_data_alloc(size_t size)
{
/* NOTE: this defers from libopenjp2 where we use opj_aligned_malloc */
void* ret = opj_malloc(size);
/* printf("opj_image_data_alloc %p\n", ret); */
return ret;
}
void OPJ_CALLCONV opj_image_data_free(void* ptr)
{
/* NOTE: this defers from libopenjp2 where we use opj_aligned_free */
/* printf("opj_image_data_free %p\n", ptr); */
opj_free(ptr);
}

View File

@ -763,6 +763,27 @@ Deallocate any resources associated with an image
*/ */
OPJ_API void OPJ_CALLCONV opj_image_destroy(opj_image_t *image); OPJ_API void OPJ_CALLCONV opj_image_destroy(opj_image_t *image);
/**
* Allocator for opj_image_t->comps[].data
* To be paired with opj_image_data_free.
*
* @param size number of bytes to allocate
*
* @return a new pointer if successful, NULL otherwise.
* @since 2.2.0
*/
OPJ_API void* OPJ_CALLCONV opj_image_data_alloc(size_t size);
/**
* Destructor for opj_image_t->comps[].data
* To be paired with opj_image_data_alloc.
*
* @param ptr Pointer to free
*
* @since 2.2.0
*/
OPJ_API void OPJ_CALLCONV opj_image_data_free(void* ptr);
/* /*
========================================================== ==========================================================
stream functions definitions stream functions definitions