diff options
| -rw-r--r-- | analyzer/pnmpsnr.c | 8 | ||||
| -rw-r--r-- | doc/HISTORY | 5 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/analyzer/pnmpsnr.c b/analyzer/pnmpsnr.c index ce2708b5..b04316cf 100644 --- a/analyzer/pnmpsnr.c +++ b/analyzer/pnmpsnr.c @@ -55,14 +55,14 @@ validateInput(struct pam const pam1, "maxval of one of them.", (unsigned int) pam1.maxval, (unsigned int) pam2.maxval); - if (streq(pam1.tuple_type, pam2.tuple_type)) + if (!streq(pam1.tuple_type, pam2.tuple_type)) pm_error("images are not of the same type. The tuple types are " "'%s' and '%s', respectively.", pam1.tuple_type, pam2.tuple_type); - if (streq(pam1.tuple_type, PAM_PBM_TUPLETYPE) && - streq(pam1.tuple_type, PAM_PGM_TUPLETYPE) && - streq(pam1.tuple_type, PAM_PPM_TUPLETYPE)) + if (!streq(pam1.tuple_type, PAM_PBM_TUPLETYPE) && + !streq(pam1.tuple_type, PAM_PGM_TUPLETYPE) && + !streq(pam1.tuple_type, PAM_PPM_TUPLETYPE)) pm_error("Images are not of a PNM type. Tuple type is '%s'", pam1.tuple_type); } diff --git a/doc/HISTORY b/doc/HISTORY index becb0ba6..12524fbb 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,11 @@ Netpbm. CHANGE HISTORY -------------- +12.04.06 BJH Releasse 10.62.01 + + pnmpsnr: fix bug: says types aren't the same when they are. + Introduced in 10.61 (December 2012). + 12.03.28 BJH Release 10.62.00 pnmtorast: set don't care bytes to zero to make output diff --git a/version.mk b/version.mk index 62cf5c53..304a1b4a 100644 --- a/version.mk +++ b/version.mk @@ -1,4 +1,4 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 62 -NETPBM_POINT_RELEASE = 0 +NETPBM_POINT_RELEASE = 1 |