about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2013-02-26 19:43:33 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2013-02-26 19:43:33 +0000
commite1750b2cbfa2f83193721c7f77b1fc122091efc4 (patch)
tree268a9c27a629e821114d3a72776b86c5b7b6fd76
parentd54e6a00f3970467d71336985563ffd49f2c7b0c (diff)
downloadnetpbm-mirror-e1750b2cbfa2f83193721c7f77b1fc122091efc4.tar.gz
netpbm-mirror-e1750b2cbfa2f83193721c7f77b1fc122091efc4.tar.xz
netpbm-mirror-e1750b2cbfa2f83193721c7f77b1fc122091efc4.zip
fix used before set bug from Revision 1542
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@1863 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/other/rasttopnm.c2
-rw-r--r--doc/HISTORY3
2 files changed, 5 insertions, 0 deletions
diff --git a/converter/other/rasttopnm.c b/converter/other/rasttopnm.c
index 2efc59b8..285fc5e0 100644
--- a/converter/other/rasttopnm.c
+++ b/converter/other/rasttopnm.c
@@ -104,6 +104,8 @@ analyzeImage(struct rasterfile const header,
     bool const grayscale =
         header.ras_maplength == 0 || colorMapIsGrayscale(colorMap);
 
+    *grayscaleP = grayscale;
+
     switch (header.ras_depth) {
     case 1:
         if (header.ras_maptype == RMT_NONE && header.ras_maplength == 0) {
diff --git a/doc/HISTORY b/doc/HISTORY
index 44a24b1f..3110464f 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -14,6 +14,9 @@ not yet  BJH  Release 10.62.00
               pamstereogram: change -guidesize default from 10 to 20
               (relevant since 10.61).
 
+              rasttopnm: fix bug: incorrect output due to used-before-set
+              variable.  Introduced in 10.56 (September 2011).
+
               pamstereogram: fix bug: doesn't reject negative guidesize.
               Broken since 10.61.