about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2011-07-10 03:13:20 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2011-07-10 03:13:20 +0000
commit158664a8d07df34cb1a17825afebdc57dc569a12 (patch)
tree0c4f1b70804f2cad22c4d9fed7e7adc47c584f1e
parent6b6feab1ffcfc7dfc1454964e157adc1bf3e6d09 (diff)
downloadnetpbm-mirror-158664a8d07df34cb1a17825afebdc57dc569a12.tar.gz
netpbm-mirror-158664a8d07df34cb1a17825afebdc57dc569a12.tar.xz
netpbm-mirror-158664a8d07df34cb1a17825afebdc57dc569a12.zip
version 10.47.29
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@1511 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--analyzer/pgmtexture.c8
-rw-r--r--doc/HISTORY5
-rw-r--r--version.mk2
3 files changed, 10 insertions, 5 deletions
diff --git a/analyzer/pgmtexture.c b/analyzer/pgmtexture.c
index 38eab114..9fb80950 100644
--- a/analyzer/pgmtexture.c
+++ b/analyzer/pgmtexture.c
@@ -997,10 +997,10 @@ main (int argc, char *argv[]) {
     sentropy[1] = f8_sentropy (P_matrix45, tones);
     sentropy[2] = f8_sentropy (P_matrix90, tones);
     sentropy[3] = f8_sentropy (P_matrix135, tones);
-    svar[0] = f7_svar (P_matrix0, tones, sentropy[0]);
-    svar[1] = f7_svar (P_matrix45, tones, sentropy[1]);
-    svar[2] = f7_svar (P_matrix90, tones, sentropy[2]);
-    svar[3] = f7_svar (P_matrix135, tones, sentropy[3]);
+    svar[0] = f7_svar (P_matrix0, tones, savg[0]);
+    svar[1] = f7_svar (P_matrix45, tones, savg[1]);
+    svar[2] = f7_svar (P_matrix90, tones, savg[2]);
+    svar[3] = f7_svar (P_matrix135, tones, savg[3]);
     results (F7, svar);
     results (F8, sentropy);
 
diff --git a/doc/HISTORY b/doc/HISTORY
index 901cc141..b75becaf 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+11.07.10 BJH  Release 10.47.29
+
+              pgmtexture: fix wrong sum variance result.  Wrong since the
+              beginning.  Thanks Francois P. S. Luus <fpsluus@gmail.com>.
+
 11.06.25 BJH  Release 10.47.28
 
               pnmpsnr: fix bug: says PGM images differ when they don't
diff --git a/version.mk b/version.mk
index ef19c898..f82f3c9a 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 47
-NETPBM_POINT_RELEASE = 28
+NETPBM_POINT_RELEASE = 29