[trunk] rename opj_create_decompress_v2 to opj_create_decompress
This commit is contained in:
parent
ef00fdf472
commit
35289bffe2
|
@ -505,19 +505,19 @@ int main(int argc, char *argv[])
|
||||||
case J2K_CFMT: /* JPEG-2000 codestream */
|
case J2K_CFMT: /* JPEG-2000 codestream */
|
||||||
{
|
{
|
||||||
/* Get a decoder handle */
|
/* Get a decoder handle */
|
||||||
l_codec = opj_create_decompress_v2(CODEC_J2K);
|
l_codec = opj_create_decompress(CODEC_J2K);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case JP2_CFMT: /* JPEG 2000 compressed image data */
|
case JP2_CFMT: /* JPEG 2000 compressed image data */
|
||||||
{
|
{
|
||||||
/* Get a decoder handle */
|
/* Get a decoder handle */
|
||||||
l_codec = opj_create_decompress_v2(CODEC_JP2);
|
l_codec = opj_create_decompress(CODEC_JP2);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case JPT_CFMT: /* JPEG 2000, JPIP */
|
case JPT_CFMT: /* JPEG 2000, JPIP */
|
||||||
{
|
{
|
||||||
/* Get a decoder handle */
|
/* Get a decoder handle */
|
||||||
l_codec = opj_create_decompress_v2(CODEC_JPT);
|
l_codec = opj_create_decompress(CODEC_JPT);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -759,19 +759,19 @@ int main(int argc, char **argv)
|
||||||
case J2K_CFMT: /* JPEG-2000 codestream */
|
case J2K_CFMT: /* JPEG-2000 codestream */
|
||||||
{
|
{
|
||||||
/* Get a decoder handle */
|
/* Get a decoder handle */
|
||||||
l_codec = opj_create_decompress_v2(CODEC_J2K);
|
l_codec = opj_create_decompress(CODEC_J2K);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case JP2_CFMT: /* JPEG 2000 compressed image data */
|
case JP2_CFMT: /* JPEG 2000 compressed image data */
|
||||||
{
|
{
|
||||||
/* Get a decoder handle */
|
/* Get a decoder handle */
|
||||||
l_codec = opj_create_decompress_v2(CODEC_JP2);
|
l_codec = opj_create_decompress(CODEC_JP2);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case JPT_CFMT: /* JPEG 2000, JPIP */
|
case JPT_CFMT: /* JPEG 2000, JPIP */
|
||||||
{
|
{
|
||||||
/* Get a decoder handle */
|
/* Get a decoder handle */
|
||||||
l_codec = opj_create_decompress_v2(CODEC_JPT);
|
l_codec = opj_create_decompress(CODEC_JPT);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -286,10 +286,7 @@ const char* OPJ_CALLCONV opj_version(void) {
|
||||||
return PACKAGE_VERSION;
|
return PACKAGE_VERSION;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
opj_codec_t* OPJ_CALLCONV opj_create_decompress(OPJ_CODEC_FORMAT p_format)
|
||||||
|
|
||||||
|
|
||||||
opj_codec_t* OPJ_CALLCONV opj_create_decompress_v2(OPJ_CODEC_FORMAT p_format)
|
|
||||||
{
|
{
|
||||||
opj_codec_private_t *l_codec = 00;
|
opj_codec_private_t *l_codec = 00;
|
||||||
|
|
||||||
|
|
|
@ -1191,7 +1191,6 @@ DEPRECATED( OPJ_API opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_p
|
||||||
==========================================================
|
==========================================================
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a J2K/JP2 decompression structure
|
* Creates a J2K/JP2 decompression structure
|
||||||
* @param format Decoder to select
|
* @param format Decoder to select
|
||||||
|
|
|
@ -195,19 +195,19 @@ int main(int argc, char **argv)
|
||||||
case J2K_CFMT: /* JPEG-2000 codestream */
|
case J2K_CFMT: /* JPEG-2000 codestream */
|
||||||
{
|
{
|
||||||
/* Get a decoder handle */
|
/* Get a decoder handle */
|
||||||
l_codec = opj_create_decompress_v2(CODEC_J2K);
|
l_codec = opj_create_decompress(CODEC_J2K);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case JP2_CFMT: /* JPEG 2000 compressed image data */
|
case JP2_CFMT: /* JPEG 2000 compressed image data */
|
||||||
{
|
{
|
||||||
/* Get a decoder handle */
|
/* Get a decoder handle */
|
||||||
l_codec = opj_create_decompress_v2(CODEC_JP2);
|
l_codec = opj_create_decompress(CODEC_JP2);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case JPT_CFMT: /* JPEG 2000, JPIP */
|
case JPT_CFMT: /* JPEG 2000, JPIP */
|
||||||
{
|
{
|
||||||
/* Get a decoder handle */
|
/* Get a decoder handle */
|
||||||
l_codec = opj_create_decompress_v2(CODEC_JPT);
|
l_codec = opj_create_decompress(CODEC_JPT);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -256,13 +256,13 @@ int main (int argc, char *argv[])
|
||||||
case J2K_CFMT: /* JPEG-2000 codestream */
|
case J2K_CFMT: /* JPEG-2000 codestream */
|
||||||
{
|
{
|
||||||
/* Get a decoder handle */
|
/* Get a decoder handle */
|
||||||
l_codec = opj_create_decompress_v2(CODEC_J2K);
|
l_codec = opj_create_decompress(CODEC_J2K);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case JP2_CFMT: /* JPEG 2000 compressed image data */
|
case JP2_CFMT: /* JPEG 2000 compressed image data */
|
||||||
{
|
{
|
||||||
/* Get a decoder handle */
|
/* Get a decoder handle */
|
||||||
l_codec = opj_create_decompress_v2(CODEC_JP2);
|
l_codec = opj_create_decompress(CODEC_JP2);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue