diff options
| author | mayeut <mayeut@users.noreply.github.com> | 2015-06-05 20:42:57 +0200 |
|---|---|---|
| committer | mayeut <mayeut@users.noreply.github.com> | 2015-06-05 20:42:57 +0200 |
| commit | c7535d084e1619f957f23bd18284dc3f3214165f (patch) | |
| tree | 5bda64598694437239f52381c83a2b56d1854736 /src/bin | |
| parent | d1a941ea50bbae66a566771d408555bdc5134348 (diff) | |
| parent | c0d7afe15c0e88886582a357a4e2fb797ac8a820 (diff) | |
Merge branch 'master' into issue-254
Diffstat (limited to 'src/bin')
| -rw-r--r-- | src/bin/jp2/opj_compress.c | 11 | ||||
| -rw-r--r-- | src/bin/jp2/opj_decompress.c | 6 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/bin/jp2/opj_compress.c b/src/bin/jp2/opj_compress.c index 493555db..e9f3eedf 100644 --- a/src/bin/jp2/opj_compress.c +++ b/src/bin/jp2/opj_compress.c @@ -699,7 +699,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param OPJ_UINT32 numlayers = 0, numresolution = 0, matrix_width = 0; char *s = opj_optarg; - sscanf(s, "%ud", &numlayers); + sscanf(s, "%u", &numlayers); s++; if (numlayers > 9) s++; @@ -871,7 +871,7 @@ static int parse_cmdline_encoder(int argc, char **argv, opj_cparameters_t *param char *s = opj_optarg; POC = parameters->POC; - while (sscanf(s, "T%ud=%ud,%ud,%ud,%ud,%ud,%4s", &POC[numpocs].tile, + while (sscanf(s, "T%u=%u,%u,%u,%u,%u,%4s", &POC[numpocs].tile, &POC[numpocs].resno0, &POC[numpocs].compno0, &POC[numpocs].layno1, &POC[numpocs].resno1, &POC[numpocs].compno1, POC[numpocs].progorder) == 7) { @@ -1768,7 +1768,12 @@ int main(int argc, char **argv) { parameters.cp_tdx = 512; parameters.cp_tdy = 512; } - opj_setup_encoder(l_codec, ¶meters, image); + if (! opj_setup_encoder(l_codec, ¶meters, image)) { + fprintf(stderr, "failed to encode image: opj_setup_encoder\n"); + opj_destroy_codec(l_codec); + opj_image_destroy(image); + return 1; + } /* open a byte stream for writing and allocate memory for all tiles */ l_stream = opj_stream_create_default_file_stream(parameters.outfile,OPJ_FALSE); diff --git a/src/bin/jp2/opj_decompress.c b/src/bin/jp2/opj_decompress.c index a6bc182a..136cc9c1 100644 --- a/src/bin/jp2/opj_decompress.c +++ b/src/bin/jp2/opj_decompress.c @@ -629,7 +629,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_decompress_parameters *para case 'r': /* reduce option */ { - sscanf(opj_optarg, "%ud", &(parameters->core.cp_reduce)); + sscanf(opj_optarg, "%u", &(parameters->core.cp_reduce)); } break; @@ -638,7 +638,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_decompress_parameters *para case 'l': /* layering option */ { - sscanf(opj_optarg, "%ud", &(parameters->core.cp_layer)); + sscanf(opj_optarg, "%u", &(parameters->core.cp_layer)); } break; @@ -678,7 +678,7 @@ int parse_cmdline_decoder(int argc, char **argv, opj_decompress_parameters *para case 't': /* Input tile index */ { - sscanf(opj_optarg, "%ud", ¶meters->tile_index); + sscanf(opj_optarg, "%u", ¶meters->tile_index); parameters->nb_tile_to_decode = 1; } break; |