generic-library/openjpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[trunk] rename opj_setup_encoder_v2 to opj_setup_encoder

Browse Source
This commit is contained in:
Mickael Savinaud
2012-08-09 12:35:13 +00:00
parent 459db3d64b
commit 6767ea2456
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/codec/image_to_j2k.c
View File

@@ -1821,7 +1821,7 @@ int main(int argc, char **argv) {
parameters.cp_tdx = 512; parameters.cp_tdx = 512;
parameters.cp_tdy = 512; parameters.cp_tdy = 512;
} }
opj_setup_encoder_v2(l_codec, &parameters, image); opj_setup_encoder(l_codec, &parameters, image);
/* Open the output file*/ /* Open the output file*/
fout = fopen(parameters.outfile, "wb"); fout = fopen(parameters.outfile, "wb");

6
libopenjpeg/openjpeg.c
View File

@@ -673,9 +673,9 @@ opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream ( FILE * p_file,
return l_stream; return l_stream;
} }
opj_bool OPJ_CALLCONV opj_setup_encoder_v2( opj_codec_t *p_codec, opj_bool OPJ_CALLCONV opj_setup_encoder(opj_codec_t *p_codec,
opj_cparameters_t *parameters, opj_cparameters_t *parameters,
opj_image_t *p_image) opj_image_t *p_image)
{ {
if (p_codec && parameters && p_image) { if (p_codec && parameters && p_image) {
opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec; opj_codec_private_t * l_codec = (opj_codec_private_t *) p_codec;

6
libopenjpeg/openjpeg.h
View File

@@ -1400,9 +1400,9 @@ OPJ_API void OPJ_CALLCONV opj_set_default_encoder_parameters(opj_cparameters_t *
* @param parameters Compression parameters * @param parameters Compression parameters
* @param image Input filled image * @param image Input filled image
*/ */
OPJ_API opj_bool OPJ_CALLCONV opj_setup_encoder_v2( opj_codec_t *p_codec, OPJ_API opj_bool OPJ_CALLCONV opj_setup_encoder(opj_codec_t *p_codec,
opj_cparameters_t *parameters, opj_cparameters_t *parameters,
opj_image_t *image); opj_image_t *image);
/** /**
*/ */

2
tests/test_tile_encoder.c
View File

@@ -271,7 +271,7 @@ int main (int argc, char *argv[])
l_image->y1 = image_height; l_image->y1 = image_height;
l_image->color_space = CLRSPC_SRGB; l_image->color_space = CLRSPC_SRGB;
if (! opj_setup_encoder_v2(l_codec,&l_param,l_image)) { if (! opj_setup_encoder(l_codec,&l_param,l_image)) {
fprintf(stderr, "ERROR -> test_tile_encoder: failed to setup the codec!\n"); fprintf(stderr, "ERROR -> test_tile_encoder: failed to setup the codec!\n");
opj_destroy_codec(l_codec); opj_destroy_codec(l_codec);
opj_image_destroy(l_image); opj_image_destroy(l_image);