about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2011-06-25 20:11:44 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2011-06-25 20:11:44 +0000
commit6b6feab1ffcfc7dfc1454964e157adc1bf3e6d09 (patch)
tree475daaebdadfe1cee31fd23eacc1a082078cf2a9
parent4157cdd6434bdc76a174531d4a13bc760a49b7e0 (diff)
downloadnetpbm-mirror-6b6feab1ffcfc7dfc1454964e157adc1bf3e6d09.tar.gz
netpbm-mirror-6b6feab1ffcfc7dfc1454964e157adc1bf3e6d09.tar.xz
netpbm-mirror-6b6feab1ffcfc7dfc1454964e157adc1bf3e6d09.zip
Release 10.47.28
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@1496 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--analyzer/pnmpsnr.c2
-rw-r--r--doc/HISTORY9
-rw-r--r--lib/libsystem.c2
-rw-r--r--version.mk2
4 files changed, 12 insertions, 3 deletions
diff --git a/analyzer/pnmpsnr.c b/analyzer/pnmpsnr.c
index 88b2a981..c32f7d64 100644
--- a/analyzer/pnmpsnr.c
+++ b/analyzer/pnmpsnr.c
@@ -126,7 +126,7 @@ reportPsnr(struct pam const pam,
         else
             pm_message("Cr color component does not differ.");
     } else {
-        if (ySumSqDiff == 0)
+        if (ySumSqDiff > 0)
             pm_message("PSNR between %s and %s: %.2f dB",
                        filespec1, filespec2, 10 * log10(yPsnr));
         else
diff --git a/doc/HISTORY b/doc/HISTORY
index 35bf6257..901cc141 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,15 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+11.06.25 BJH  Release 10.47.28
+
+              pnmpsnr: fix bug: says PGM images differ when they don't
+              and vice versa.
+
+              libnetpbm: pm_system(): fix bug - program always takes
+              Standard Input from invoker's Standard Input when you don't
+              supply a Standard Output accepter.
+
 11.03.27 BJH  Release 10.47.27
 
               g3topbm: correct error message: codes go up to 13 bits.
diff --git a/lib/libsystem.c b/lib/libsystem.c
index 3a7440ba..1f445844 100644
--- a/lib/libsystem.c
+++ b/lib/libsystem.c
@@ -416,7 +416,7 @@ pm_system_vp(const char *    const progName,
         /* Run a child process for the program that sends its Standard Output
            to our Standard Output
         */
-        spawnProcessor(progName, argArray, STDIN, NULL, &processorPid);
+        spawnProcessor(progName, argArray, progStdinFd, NULL, &processorPid);
     }
 
     cleanupProcessorProcess(processorPid);
diff --git a/version.mk b/version.mk
index 4a73bbe6..ef19c898 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 47
-NETPBM_POINT_RELEASE = 27
+NETPBM_POINT_RELEASE = 28