From 1e753728ffb51a8c7cf1a965441bd4be287990ce Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Sun, 25 Jan 2015 18:52:43 +0000
Subject: Release 10.47.54

git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@2403 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 converter/other/Makefile   |  3 +++
 converter/other/giftopnm.c |  2 +-
 doc/HISTORY                | 17 +++++++++++++++++
 editor/pnmgamma.c          |  4 ++--
 lib/libppm1.c              |  4 ++--
 version.mk                 |  2 +-
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/converter/other/Makefile b/converter/other/Makefile
index ff87c8b8..df084ceb 100644
--- a/converter/other/Makefile
+++ b/converter/other/Makefile
@@ -234,6 +234,9 @@ endif
 # In May 2002, pamtouil replaced ppmtouil
 	cd $(PKGDIR)/bin ; \
 	$(SYMLINK) pamtouil$(EXE) ppmtouil$(EXE)
+# In July 2002, pamtotga replaced ppmtotga
+	cd $(PKGDIR)/bin ; \
+	$(SYMLINK) pamtotga$(EXE) ppmtotga$(EXE)
 # In March 2005, we realized that pamtopnm obviates pnmtopnm
 	cd $(PKGDIR)/bin ; \
 	$(SYMLINK) pamtopnm$(EXE) pnmtopnm$(EXE)
diff --git a/converter/other/giftopnm.c b/converter/other/giftopnm.c
index 9c6db046..4b8b0487 100644
--- a/converter/other/giftopnm.c
+++ b/converter/other/giftopnm.c
@@ -302,7 +302,7 @@ getDataBlock(FILE *          const ifP,
     successfulRead = ReadOK(ifP, &count, 1);
     if (!successfulRead) {
         pm_message("EOF or error in reading DataBlock size from file" );
-        *errorP = FALSE;
+        *errorP = NULL;
         *eofP = TRUE;
         *lengthP = 0;
     } else {
diff --git a/doc/HISTORY b/doc/HISTORY
index ff701c7f..3584d8cb 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,23 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+15.01.25 BJH  Release 10.47.54
+
+              pnmgamma -srgbtobt709, -bt709tosrgb: fix bug; incorrect output
+              nearly always.  Always broken (These options were new in
+              Netpbm 10.32 (February 2006)).
+
+              build: fix incompatible type compilation error in giftopnm.
+              Broken in Netpbm 10.38 (March 2007) (but obviously manifests
+              only in recent build environments).
+
+              Fix bogus message from ppmXXX programs when the input is not
+              (per the magic number) a Netpbm image.  Introduced after
+              Netpbm 10.26 (January 2005) but before Netpbm 10.35 (August
+              2006).
+
+              Install: make backward compatibility link ppmtotga -> pamtotga .
+
 14.11.23 BJH  Release 10.47.53
 
               pambackground: fix bug: segfault or incorrect results in most
diff --git a/editor/pnmgamma.c b/editor/pnmgamma.c
index 507afae9..b079adf1 100644
--- a/editor/pnmgamma.c
+++ b/editor/pnmgamma.c
@@ -509,7 +509,7 @@ buildBt709ToSrgbGamma(xelval       table[],
         else
             radiance = pow((normalized + 0.099) / 1.099, gamma709);
 
-        if (radiance < linearCutoffSrgb)
+        if (radiance < linearCutoffSrgb * normalizer)
             srgb = radiance * linearExpansionSrgb;
         else
             srgb = 1.055 * pow(normalized, oneOverGammaSrgb) - 0.055;
@@ -563,7 +563,7 @@ buildSrgbToBt709Gamma(xelval       table[],
         else
             radiance = pow((normalized + 0.099) / 1.099, gammaSrgb);
 
-        if (radiance < linearCutoff709)
+        if (radiance < linearCutoff709 * normalizer)
             bt709 = radiance * linearExpansion709;
         else
             bt709 = 1.055 * pow(normalized, oneOverGamma709) - 0.055;
diff --git a/lib/libppm1.c b/lib/libppm1.c
index ea929908..97110730 100644
--- a/lib/libppm1.c
+++ b/lib/libppm1.c
@@ -145,8 +145,8 @@ ppm_readppminit(FILE *   const fileP,
         break;
 
     default:
-        pm_error("bad magic number %d - not a PPM, PGM, PBM, or PAM file",
-                 PAM_FORMAT_TYPE(*formatP));
+        pm_error("bad magic number 0x%x - not a PPM, PGM, PBM, or PAM file",
+                 realFormat);
     }
     validateComputableSize(*colsP, *rowsP);
 }
diff --git a/version.mk b/version.mk
index 5905eb9d..fc167e3e 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 47
-NETPBM_POINT_RELEASE = 53
+NETPBM_POINT_RELEASE = 54
-- 
cgit 1.4.1