From 6def3baf76c7a8050e20b06733b1e0a7bef226ee Mon Sep 17 00:00:00 2001 From: giraffedata Date: Fri, 11 Sep 2020 08:03:11 +0000 Subject: Fix -progression git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3958 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- converter/other/jpeg2000/pamtojpeg2k.c | 10 +++++----- doc/HISTORY | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/converter/other/jpeg2000/pamtojpeg2k.c b/converter/other/jpeg2000/pamtojpeg2k.c index 4d73316a..e2bb125b 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'. " diff --git a/doc/HISTORY b/doc/HISTORY index 5b06e3dd..92b0b041 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -31,6 +31,9 @@ not yet BJH Release 10.92.00 jpeg2ktopam: Fix crash whenever the program fails. Broken in Netpbm 10.42 (March 2008). + pamtojpeg2k: Fix failure with most -progression values. Always + broken (pamtojpeg2k was new in Netpbm 10.12 (November 2002)). + pamarith: Fix crash with -compare where inputs are PBM or BLACKANDWHITE PAM. Broken in Netpbm 10.14 (February 2003). -- cgit 1.4.1