walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

remove deprecated v1 style function j2k_create_compress; rename opj_j2k_create_compress_v2 to opj_j2k_create_compress

This commit is contained in:
Mickael Savinaud 2012-08-16 13:46:43 +00:00
parent 1f94541732
commit 01c95cb07e
4 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libopenjpeg/j2k.c
View File

@ -6064,15 +6064,7 @@ void opj_j2k_setup_decoder(opj_j2k_v2_t *j2k, opj_dparameters_t *parameters)
/* J2K encoder interface */ /* J2K encoder interface */
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
opj_j2k_t* j2k_create_compress(opj_common_ptr cinfo) { opj_j2k_v2_t* opj_j2k_create_compress(void)
opj_j2k_t *j2k = (opj_j2k_t*) opj_calloc(1, sizeof(opj_j2k_t));
if(j2k) {
j2k->cinfo = cinfo;
}
return j2k;
}
opj_j2k_v2_t* opj_j2k_create_compress_v2(void)
{ {
opj_j2k_v2_t *l_j2k = (opj_j2k_v2_t*) opj_malloc(sizeof(opj_j2k_v2_t)); opj_j2k_v2_t *l_j2k = (opj_j2k_v2_t*) opj_malloc(sizeof(opj_j2k_v2_t));
if (!l_j2k) { if (!l_j2k) {

9
libopenjpeg/j2k.h
View File

@ -792,14 +792,7 @@ Creates a J2K compression structure
@param cinfo Codec context info @param cinfo Codec context info
@return Returns a handle to a J2K compressor if successful, returns NULL otherwise @return Returns a handle to a J2K compressor if successful, returns NULL otherwise
*/ */
opj_j2k_t* j2k_create_compress(opj_common_ptr cinfo); opj_j2k_v2_t* opj_j2k_create_compress(void);
/**
Creates a J2K compression structure
@param cinfo Codec context info
@return Returns a handle to a J2K compressor if successful, returns NULL otherwise
*/
opj_j2k_v2_t* opj_j2k_create_compress_v2(void);
void opj_j2k_setup_encoder( opj_j2k_v2_t *p_j2k, void opj_j2k_setup_encoder( opj_j2k_v2_t *p_j2k,

2
libopenjpeg/jp2.c
View File

@ -2559,7 +2559,7 @@ opj_jp2_v2_t* opj_jp2_create(opj_bool p_is_decoder)
/* create the J2K codec */ /* create the J2K codec */
if (! p_is_decoder) { if (! p_is_decoder) {
jp2->j2k = opj_j2k_create_compress_v2(); jp2->j2k = opj_j2k_create_compress();
} }
else { else {
jp2->j2k = opj_j2k_create_decompress(); jp2->j2k = opj_j2k_create_decompress();

2
libopenjpeg/openjpeg.c
View File

@ -751,7 +751,7 @@ opj_codec_t* OPJ_CALLCONV opj_create_compress(OPJ_CODEC_FORMAT p_format)
struct opj_image *, struct opj_image *,
struct opj_event_mgr * )) opj_j2k_setup_encoder; struct opj_event_mgr * )) opj_j2k_setup_encoder;
l_codec->m_codec = opj_j2k_create_compress_v2(); l_codec->m_codec = opj_j2k_create_compress();
if (! l_codec->m_codec) { if (! l_codec->m_codec) {
opj_free(l_codec); opj_free(l_codec);
return 00; return 00;