about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2008-10-12 23:07:32 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2008-10-12 23:07:32 +0000
commitb06d17a000761a14900f9ec22740b7415c8a304c (patch)
treeb866442f6ae3620d569d90f331ce5a211089f253
parent5d64f5134f6677a5f6766cd4a6245f0a9056e152 (diff)
downloadnetpbm-mirror-b06d17a000761a14900f9ec22740b7415c8a304c.tar.gz
netpbm-mirror-b06d17a000761a14900f9ec22740b7415c8a304c.tar.xz
netpbm-mirror-b06d17a000761a14900f9ec22740b7415c8a304c.zip
Release 10.35.53
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@754 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--Makefile.version2
-rw-r--r--doc/HISTORY4
-rw-r--r--editor/pamditherbw.c3
3 files changed, 7 insertions, 2 deletions
diff --git a/Makefile.version b/Makefile.version
index e57f2743..c78140b3 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 52
+NETPBM_POINT_RELEASE = 53
diff --git a/doc/HISTORY b/doc/HISTORY
index 4b07991f..cece662d 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,10 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+08.10.12 BJH  Release 10.35.53
+
+              pamditherbw: Fix -value other than .5 with -fs .
+
 08.09.27 BJH  Release 10.35.52
 
               libppmd/ppmdraw: fix crash when line is completely out of
diff --git a/editor/pamditherbw.c b/editor/pamditherbw.c
index e4c0d4c6..f9e159f1 100644
--- a/editor/pamditherbw.c
+++ b/editor/pamditherbw.c
@@ -425,7 +425,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 to justify a white output
                pixel.