diff options
| author | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-11-15 13:38:35 +0000 |
|---|---|---|
| committer | Mickael Savinaud <savmickael@users.noreply.github.com> | 2012-11-15 13:38:35 +0000 |
| commit | e212154d8d43ec583cb6dc8f963b97988a54c11d (patch) | |
| tree | 074b1b8b459ce72933177247b3d9a891fa00e5c2 /tests/test_tile_encoder.c | |
| parent | ec0fe091380c2de75584fdfc3d914eee5b89e731 (diff) | |
[trunk]extend last commits to apps
Diffstat (limited to 'tests/test_tile_encoder.c')
| -rw-r--r-- | tests/test_tile_encoder.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/test_tile_encoder.c b/tests/test_tile_encoder.c index a405d86e..22ecb348 100644 --- a/tests/test_tile_encoder.c +++ b/tests/test_tile_encoder.c @@ -175,7 +175,7 @@ int main (int argc, char *argv[]) l_param.irreversible = irreversible; /* do not bother with mct, the rsiz is set when calling opj_set_MCT*/ - /*l_param.cp_rsiz = STD_RSIZ;*/ + /*l_param.cp_rsiz = OPJ_STD_RSIZ;*/ /* no cinema */ /*l_param.cp_cinema = 0;*/ @@ -203,8 +203,8 @@ int main (int argc, char *argv[]) l_param.numresolution = 6; /** progression order to use*/ - /** LRCP, RLCP, RPCL, PCRL, CPRL */ - l_param.prog_order = LRCP; + /** OPJ_LRCP, OPJ_RLCP, OPJ_RPCL, PCRL, CPRL */ + l_param.prog_order = OPJ_LRCP; /** no "region" of interest, more precisally component */ /* l_param.roi_compno = -1; */ @@ -244,11 +244,11 @@ int main (int argc, char *argv[]) len = strlen( output_file ); if( strcmp( output_file + len - 4, ".jp2" ) == 0 ) { - l_codec = opj_create_compress(CODEC_JP2); + l_codec = opj_create_compress(OPJ_CODEC_JP2); } else { - l_codec = opj_create_compress(CODEC_J2K); + l_codec = opj_create_compress(OPJ_CODEC_J2K); } if (!l_codec) { return 1; @@ -259,7 +259,7 @@ int main (int argc, char *argv[]) opj_set_warning_handler(l_codec, warning_callback,00); opj_set_error_handler(l_codec, error_callback,00); - l_image = opj_image_tile_create(num_comps,l_params,CLRSPC_SRGB); + l_image = opj_image_tile_create(num_comps,l_params,OPJ_CLRSPC_SRGB); if (! l_image) { opj_destroy_codec(l_codec); return 1; @@ -269,7 +269,7 @@ int main (int argc, char *argv[]) l_image->y0 = 0; l_image->x1 = image_width; l_image->y1 = image_height; - l_image->color_space = CLRSPC_SRGB; + l_image->color_space = OPJ_CLRSPC_SRGB; if (! opj_setup_encoder(l_codec,&l_param,l_image)) { fprintf(stderr, "ERROR -> test_tile_encoder: failed to setup the codec!\n"); |