about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2008-09-12 03:28:45 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2008-09-12 03:28:45 +0000
commita23f38fc2e675b089ca23baf71d3e4c3ab23543e (patch)
tree8a081f4829262741975f6d0d38a4acacf95bae69
parent37f38cafb6719d3bde8c487a597400a81d733aba (diff)
downloadnetpbm-mirror-a23f38fc2e675b089ca23baf71d3e4c3ab23543e.tar.gz
netpbm-mirror-a23f38fc2e675b089ca23baf71d3e4c3ab23543e.tar.xz
netpbm-mirror-a23f38fc2e675b089ca23baf71d3e4c3ab23543e.zip
Release 10.35.51
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@723 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--Makefile.version2
-rw-r--r--doc/HISTORY4
-rw-r--r--generator/pamgradient.c6
3 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.version b/Makefile.version
index 8b73e929..c9a70b30 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 35
-NETPBM_POINT_RELEASE = 49
+NETPBM_POINT_RELEASE = 51
diff --git a/doc/HISTORY b/doc/HISTORY
index 16fc4535..9d669dc1 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,10 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+08.09.12 BJH  Release 10.35.51
+
+              pamgradient: fix bug: always produces color, not grayscale.
+
 08.08.29 BJH  Release 10.35.50
 
               pnm_backgroundxel(), pnm_backgroundxelrow() (affects
diff --git a/generator/pamgradient.c b/generator/pamgradient.c
index 7717bf4b..08db86e3 100644
--- a/generator/pamgradient.c
+++ b/generator/pamgradient.c
@@ -124,10 +124,8 @@ static int
 isgray(struct pam * const pamP,
        tuple        const color) {
 
-    return (pamP->depth == 1)
-        || ((pamP->depth == 3)
-        && (color[PAM_RED_PLANE] == color[PAM_GRN_PLANE])
-        && (color[PAM_RED_PLANE] == color[PAM_BLU_PLANE])); 
+    return (color[PAM_RED_PLANE] == color[PAM_GRN_PLANE])
+            && (color[PAM_RED_PLANE] == color[PAM_BLU_PLANE]);
 }