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

[trunk] Upon failure, need to return proper return code

Browse Source
This commit is contained in:
Mathieu Malaterre 2014-03-07 17:23:19 +00:00
parent fa1c2454e6
commit f54de95802
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/jp2/opj_decompress.c
View File

@ -676,7 +676,6 @@ static void info_callback(const char *msg, void *client_data) {
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
opj_dparameters_t parameters; /* decompression parameters */ opj_dparameters_t parameters; /* decompression parameters */
opj_image_t* image = NULL; opj_image_t* image = NULL;
opj_stream_t *l_stream = NULL; /* Stream */ opj_stream_t *l_stream = NULL; /* Stream */
@ -688,6 +687,7 @@ int main(int argc, char **argv)
OPJ_INT32 num_images, imageno; OPJ_INT32 num_images, imageno;
img_fol_t img_fol; img_fol_t img_fol;
dircnt_t *dirptr = NULL; dircnt_t *dirptr = NULL;
int failed = 0;
/* set decoding parameters to default values */ /* set decoding parameters to default values */
opj_set_default_decoder_parameters(&parameters); opj_set_default_decoder_parameters(&parameters);
@ -871,7 +871,8 @@ int main(int argc, char **argv)
switch (parameters.cod_format) { switch (parameters.cod_format) {
case PXM_DFMT: /* PNM PGM PPM */ case PXM_DFMT: /* PNM PGM PPM */
if (imagetopnm(image, parameters.outfile)) { if (imagetopnm(image, parameters.outfile)) {
fprintf(stdout,"Outfile %s not generated\n",parameters.outfile); fprintf(stderr,"Outfile %s not generated\n",parameters.outfile);
failed = 1;
} }
else { else {
fprintf(stdout,"Generated Outfile %s\n",parameters.outfile); fprintf(stdout,"Generated Outfile %s\n",parameters.outfile);
@ -961,7 +962,7 @@ int main(int argc, char **argv)
opj_destroy_cstr_index(&cstr_index); opj_destroy_cstr_index(&cstr_index);
} }
return EXIT_SUCCESS; return failed ? EXIT_FAILURE : EXIT_SUCCESS;
} }
/*end main*/ /*end main*/