From 2096d552041fff92edef9ec3a6a5a6c63d210287 Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Fri, 5 Jul 2013 17:46:33 +0000
Subject: Release 10.63.01

git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@1974 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 converter/other/pngtopam.c | 12 +++++++++---
 doc/HISTORY                |  5 +++++
 version.mk                 |  2 +-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/converter/other/pngtopam.c b/converter/other/pngtopam.c
index d748c327..14b38987 100644
--- a/converter/other/pngtopam.c
+++ b/converter/other/pngtopam.c
@@ -327,6 +327,9 @@ reader_createAllAtOnce(struct pngx * const pngxP,
 
    The Reader object reads the PNG at construction time, stores the entire
    raster, and hands it out as you call reader_read().
+
+   It is essential that *pngxP be already fully set up to read the image
+   (all options set).
 -----------------------------------------------------------------------------*/
     Reader * readerP;
 
@@ -1441,9 +1444,6 @@ convertpng(FILE *             const ifP,
     if (verbose)
         dumpPngInfo(pngxP);
 
-    rasterReaderP = cmdline.byrow ? 
-        reader_createRowByRow(pngxP, ifP) : reader_createAllAtOnce(pngxP, ifP);
-
     if (cmdline.time)
         showTime(pngxP);
     if (tfP)
@@ -1469,6 +1469,9 @@ convertpng(FILE *             const ifP,
     determineOutputType(pngxP, cmdline.alpha, bgColor, pngxP->maxval,
                         &pam.format, &pam.depth, pam.tuple_type);
 
+    rasterReaderP = cmdline.byrow ? 
+        reader_createRowByRow(pngxP, ifP) : reader_createAllAtOnce(pngxP, ifP);
+
     writeNetpbm(&pam, pngxP, rasterReaderP, bgColor,
                 cmdline.alpha, totalgamma);
 
@@ -1514,3 +1517,6 @@ main(int argc, const char *argv[]) {
 
     return errorLevel;
 }
+
+
+
diff --git a/doc/HISTORY b/doc/HISTORY
index 30be7d5c..422633bb 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,11 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+13.07.04 BJH  Release 10.63.01
+
+              pngtopam: fix bug: ignores -gamma.  Introduced in 10.48
+              (September 2009).
+
 13.06.29 BJH  Release 10.63.00
 
               Add pamtowinicon, winicontopam.  Thanks Ludolf Holzheid
diff --git a/version.mk b/version.mk
index 70979cfd..d6a12d17 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,4 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 63
-NETPBM_POINT_RELEASE = 0
+NETPBM_POINT_RELEASE = 1
 
-- 
cgit 1.4.1