diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 11:46:19 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-08-09 11:46:19 +0000 |
| commit | ef00fdf472407c217e4c49ea8241b56ccc68ddec (patch) | |
| tree | 162dc7ef5d3f8dc1e50e5eaf65cd87501fe97458 | |
| parent | 3de7e8358fbf78e8049792f97d9f071f2f6286c5 (diff) | |
[trunk] remove V1 style function opj_create_decompress
| -rw-r--r-- | libopenjpeg/openjpeg.c | 39 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.h | 8 |
2 files changed, 5 insertions, 42 deletions
diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index 4c809dac..2904d778 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -131,9 +131,10 @@ typedef struct opj_compression typedef struct opj_codec_private { /** FIXME DOC */ - union { - opj_decompression_t m_decompression; - opj_compression_t m_compression; + union + { + opj_decompression_t m_decompression; + opj_compression_t m_compression; } m_codec_data; /** FIXME DOC*/ void * m_codec; @@ -286,39 +287,7 @@ const char* OPJ_CALLCONV opj_version(void) { } -/* DEPRECATED */ -opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format) { - opj_dinfo_t *dinfo = (opj_dinfo_t*)opj_calloc(1, sizeof(opj_dinfo_t)); - if(!dinfo) return NULL; - dinfo->is_decompressor = OPJ_TRUE; - switch(format) { - case CODEC_J2K: - case CODEC_JPT: - /* get a J2K decoder handle */ - dinfo->j2k_handle = (void*)j2k_create_decompress((opj_common_ptr)dinfo); - if(!dinfo->j2k_handle) { - opj_free(dinfo); - return NULL; - } - break; - case CODEC_JP2: - /* get a JP2 decoder handle */ - dinfo->jp2_handle = (void*)jp2_create_decompress((opj_common_ptr)dinfo); - if(!dinfo->jp2_handle) { - opj_free(dinfo); - return NULL; - } - break; - case CODEC_UNKNOWN: - default: - opj_free(dinfo); - return NULL; - } - dinfo->codec_format = format; - - return dinfo; -} opj_codec_t* OPJ_CALLCONV opj_create_decompress_v2(OPJ_CODEC_FORMAT p_format) { diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h index cb6c345f..11ef06b2 100644 --- a/libopenjpeg/openjpeg.h +++ b/libopenjpeg/openjpeg.h @@ -1191,12 +1191,6 @@ DEPRECATED( OPJ_API opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_p ========================================================== */ -/** -Creates a J2K/JPT/JP2 decompression structure -@param format Decoder to select -@return Returns a handle to a decompressor if successful, returns NULL otherwise -*/ -DEPRECATED( OPJ_API opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format) ); /** * Creates a J2K/JP2 decompression structure @@ -1204,7 +1198,7 @@ DEPRECATED( OPJ_API opj_dinfo_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FO * * @return Returns a handle to a decompressor if successful, returns NULL otherwise * */ -OPJ_API opj_codec_t* OPJ_CALLCONV opj_create_decompress_v2(OPJ_CODEC_FORMAT format); +OPJ_API opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT format); /** Destroy a decompressor handle |