about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2012-12-14 03:27:48 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2012-12-14 03:27:48 +0000
commit7f5a12073d3a2b4b649f9ad6f7ef26998b9e8034 (patch)
tree5e2c82d84f48c4c5f08f32d88a2699d7a59a3a42
parent83bc96c764586d4ce4da6283b72b29438601ab7b (diff)
downloadnetpbm-mirror-7f5a12073d3a2b4b649f9ad6f7ef26998b9e8034.tar.gz
netpbm-mirror-7f5a12073d3a2b4b649f9ad6f7ef26998b9e8034.tar.xz
netpbm-mirror-7f5a12073d3a2b4b649f9ad6f7ef26998b9e8034.zip
Fix bug: wrong depth for GRAYSCALE_ALPHA output
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1808 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/other/pngtopam.c2
-rw-r--r--doc/HISTORY5
2 files changed, 6 insertions, 1 deletions
diff --git a/converter/other/pngtopam.c b/converter/other/pngtopam.c
index 160ad667..d748c327 100644
--- a/converter/other/pngtopam.c
+++ b/converter/other/pngtopam.c
@@ -1131,7 +1131,7 @@ determineOutputType(struct pngx *       const pngxP,
                 *depthP = 4;
                 strcpy(tupleType, "RGB_ALPHA");
             } else {
-                *depthP = 1;
+                *depthP = 2;
                 strcpy(tupleType, "GRAYSCALE_ALPHA");
             }
         } else {
diff --git a/doc/HISTORY b/doc/HISTORY
index e0ef10bd..daf78cd9 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -15,6 +15,11 @@ not yet  BJH  Release 10.61.00
               metadata, small images do require loss of quality in order to
               get down to a compression ratio of 1.
 
+              pngtopam -alphapam with grayscale input: fix bug: generates
+              invalid output: tuple type GRAYSCALE_ALPHA, but depth 1.  Depth
+              should be 2.  Always broken (pngtopam was created in 
+              Netpbm 10.44 (September 2008).
+              
               pamtotiff: fix bug: XRESOLUTION, YRESOLUTION, and RESOLUTIONUNIT
               not allowed in -tags.  Broken at least since 10.35.