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

remove deprecated v1 style function j2k_create_decompress and jp2_create_decompress

This commit is contained in:
Mickael Savinaud 2012-08-09 14:57:03 +00:00
parent c077645f77
commit 381de6b7cb
4 changed files with 2 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libopenjpeg/j2k.c
View File

@ -7624,22 +7624,7 @@ opj_bool j2k_read_cbd ( opj_j2k_v2_t *p_j2k,
/* J2K / JPT decoder interface */ /* J2K / JPT decoder interface */
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
opj_j2k_t* j2k_create_decompress(opj_common_ptr cinfo) {
opj_j2k_t *j2k = (opj_j2k_t*) opj_calloc(1, sizeof(opj_j2k_t));
if(!j2k)
return NULL;
j2k->default_tcp = (opj_tcp_t*) opj_calloc(1, sizeof(opj_tcp_t));
if(!j2k->default_tcp) {
opj_free(j2k);
return NULL;
}
j2k->cinfo = cinfo;
j2k->tile_data = NULL;
return j2k;
}
void j2k_destroy_decompress(opj_j2k_t *j2k) { void j2k_destroy_decompress(opj_j2k_t *j2k) {
int i = 0; int i = 0;

7
libopenjpeg/j2k.h
View File

@ -778,12 +778,7 @@ opj_j2k_v2_t;
/** @name Exported functions */ /** @name Exported functions */
/*@{*/ /*@{*/
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/**
Creates a J2K decompression structure
@param cinfo Codec context info
@return Returns a handle to a J2K decompressor if successful, returns NULL otherwise
*/
opj_j2k_t* j2k_create_decompress(opj_common_ptr cinfo);
/** /**
Destroy a J2K decompressor handle Destroy a J2K decompressor handle
@param j2k J2K decompressor handle to destroy @param j2k J2K decompressor handle to destroy

14
libopenjpeg/jp2.c
View File

@ -2227,20 +2227,6 @@ static void write_iptr( int offset, int length, opj_cio_t *cio)
/* JP2 decoder interface */ /* JP2 decoder interface */
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
opj_jp2_t* jp2_create_decompress(opj_common_ptr cinfo) {
opj_jp2_t *jp2 = (opj_jp2_t*) opj_calloc(1, sizeof(opj_jp2_t));
if(jp2) {
jp2->cinfo = cinfo;
/* create the J2K codec */
jp2->j2k = j2k_create_decompress(cinfo);
if(jp2->j2k == NULL) {
jp2_destroy_decompress(jp2);
return NULL;
}
}
return jp2;
}
void jp2_destroy_decompress(opj_jp2_t *jp2) { void jp2_destroy_decompress(opj_jp2_t *jp2) {
if(jp2) { if(jp2) {
/* destroy the J2K codec */ /* destroy the J2K codec */

7
libopenjpeg/jp2.h
View File

@ -280,12 +280,7 @@ Read the JP2H box - JP2 Header box (used in MJ2)
@return Returns true if successful, returns false otherwise @return Returns true if successful, returns false otherwise
*/ */
opj_bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color); opj_bool jp2_read_jp2h(opj_jp2_t *jp2, opj_cio_t *cio, opj_jp2_color_t *color);
/**
Creates a JP2 decompression structure
@param cinfo Codec context info
@return Returns a handle to a JP2 decompressor if successful, returns NULL otherwise
*/
opj_jp2_t* jp2_create_decompress(opj_common_ptr cinfo);
/** /**
Destroy a JP2 decompressor handle Destroy a JP2 decompressor handle
@param jp2 JP2 decompressor handle to destroy @param jp2 JP2 decompressor handle to destroy