diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2020-09-16 02:48:33 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2020-09-16 02:48:33 +0000 |
| commit | cd7f17a619a0421a1dfb2ceb09f4af60ead8ad5f (patch) | |
| tree | dc6e5c1b3d450dca01dfb0c9162e43d30d2ddede /converter/other | |
| parent | 2e772a749d2abdc603d7bb69c0c78de5ecf75e58 (diff) | |
| download | netpbm-mirror-cd7f17a619a0421a1dfb2ceb09f4af60ead8ad5f.tar.gz netpbm-mirror-cd7f17a619a0421a1dfb2ceb09f4af60ead8ad5f.tar.xz netpbm-mirror-cd7f17a619a0421a1dfb2ceb09f4af60ead8ad5f.zip | |
Release 10.91.04
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@3962 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other')
| -rw-r--r-- | converter/other/jpeg2000/libjasper/base/jas_stream.c | 2 | ||||
| -rw-r--r-- | converter/other/jpeg2000/pamtojpeg2k.c | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/converter/other/jpeg2000/libjasper/base/jas_stream.c b/converter/other/jpeg2000/libjasper/base/jas_stream.c index 20336fd7..a4b3a27c 100644 --- a/converter/other/jpeg2000/libjasper/base/jas_stream.c +++ b/converter/other/jpeg2000/libjasper/base/jas_stream.c @@ -415,9 +415,11 @@ jas_stream_t *jas_stream_tmpfile() if (rc == 0) { pm_setjmpbuf(&jmpbuf); *obj = pm_tmpfile_fd(); + pm_setjmpbuf(NULL); } else { /* pm_tmpfile_fd() threw an error */ jas_stream_destroy(stream); + pm_setjmpbuf(NULL); return 0; } } diff --git a/converter/other/jpeg2000/pamtojpeg2k.c b/converter/other/jpeg2000/pamtojpeg2k.c index 4d73316a..a886c390 100644 --- a/converter/other/jpeg2000/pamtojpeg2k.c +++ b/converter/other/jpeg2000/pamtojpeg2k.c @@ -196,15 +196,15 @@ parseCommandLine(int argc, char ** argv, if (!ilyrratesSpec) cmdlineP->ilyrrates = (char*) ""; if (progressionSpec) { - if (strcmp(progressionOpt, "lrcp") == 0) + if (streq(progressionOpt, "lrcp")) cmdlineP->progression = PROG_LRCP; - if (strcmp(progressionOpt, "rlcp") == 0) + else if (streq(progressionOpt, "rlcp")) cmdlineP->progression = PROG_RLCP; - if (strcmp(progressionOpt, "rpcl") == 0) + else if (streq(progressionOpt, "rpcl")) cmdlineP->progression = PROG_RPCL; - if (strcmp(progressionOpt, "pcrl") == 0) + else if (streq(progressionOpt, "pcrl")) cmdlineP->progression = PROG_PCRL; - if (strcmp(progressionOpt, "cprl") == 0) + else if (streq(progressionOpt, "cprl")) cmdlineP->progression = PROG_CPRL; else pm_error("Invalid value for -progression: '%s'. " @@ -432,7 +432,7 @@ writeJpc(jas_image_t * const jasperP, cmdline.imgareatlx, cmdline.imgareatly, cmdline.tilegrdtlx, - cmdline.tilegrdtlx, + cmdline.tilegrdtly, cmdline.tilewidth, cmdline.tileheight, cmdline.prcwidth, |