about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2008-10-12 22:56:52 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2008-10-12 22:56:52 +0000
commit6ad7dd219780b0facd26af0f28fa42fb109d1df8 (patch)
tree13c34927b5cf5b799cb5cf52f086a2c1b5c482ab
parent4b4b88014200757f6f7f8864c85138a56835c794 (diff)
downloadnetpbm-mirror-6ad7dd219780b0facd26af0f28fa42fb109d1df8.tar.gz
netpbm-mirror-6ad7dd219780b0facd26af0f28fa42fb109d1df8.tar.xz
netpbm-mirror-6ad7dd219780b0facd26af0f28fa42fb109d1df8.zip
Release 10.44.01
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@753 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--Makefile.version2
-rw-r--r--doc/HISTORY4
-rw-r--r--editor/pamditherbw.c6
3 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.version b/Makefile.version
index 1fa7479c..41586cb3 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,4 +1,4 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 44
-NETPBM_POINT_RELEASE = 00
+NETPBM_POINT_RELEASE = 1
 
diff --git a/doc/HISTORY b/doc/HISTORY
index 22868b48..f281a95a 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,10 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+08.10.12 BJH  Release 10.44.01
+
+              pamditherbw: Fix -value other than .5 work for -fs, -atkinson.
+
 08.09.27 BJH  Release 10.44.00
 
               Add pngtopam as a replacement for pngtopnm.  Has ability
diff --git a/editor/pamditherbw.c b/editor/pamditherbw.c
index f26468bb..076bec31 100644
--- a/editor/pamditherbw.c
+++ b/editor/pamditherbw.c
@@ -440,7 +440,8 @@ fsConvertRow(struct converter * const converterP,
     do {
         samplen sum;
 
-        sum = pm_ungamma709(grayrow[col][0]) + thiserr[col + 1];
+        sum = MIN(2*stateP->threshval, pm_ungamma709(grayrow[col][0])) +
+            thiserr[col + 1];
         if (sum >= stateP->threshval) {
             /* We've accumulated enough light (power) to justify a
                white output pixel.
@@ -584,7 +585,8 @@ atkinsonConvertRow(struct converter * const converterP,
     for (col = 0; col < converterP->cols; ++col) {
         samplen sum;
 
-        sum = pm_ungamma709(grayrow[col][0]) + error[0][col + 1];
+        sum = MIN(2*stateP->threshval, pm_ungamma709(grayrow[col][0])) +
+            error[0][col + 1];
         if (sum >= stateP->threshval) {
             /* We've accumulated enough light (power) to justify a
                white output pixel.