From 2661fd6ecb2ec042e56905ea1a78d11267b30d5b Mon Sep 17 00:00:00 2001
From: giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>
Date: Thu, 22 Jan 2015 16:38:17 +0000
Subject: Release 10.69.03

git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2394 9d0c8265-081b-0410-96cb-a4ca84ce46f8
---
 converter/other/Makefile | 3 +++
 doc/HISTORY              | 8 ++++++++
 editor/pnmgamma.c        | 4 ++--
 version.mk               | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/converter/other/Makefile b/converter/other/Makefile
index bbc40a3f..db185faf 100644
--- a/converter/other/Makefile
+++ b/converter/other/Makefile
@@ -267,6 +267,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/doc/HISTORY b/doc/HISTORY
index d8994e91..0973e010 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,14 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+15.01.22 BJH  Release 10.69.03
+
+              pnmgamma -srgbtobt709, -bt709tosrgb: fix bug; incorrect output
+              nearly always.  Always broken (These options were new in
+              Netpbm 10.32 (February 2006)).
+
+              Install: make backward compatibility link ppmtotga -> pamtotga .
+
 15.01.01 BJH  Release 10.69.02
 
               Libnetpbm: fix external header file pm.h so it does not include
diff --git a/editor/pnmgamma.c b/editor/pnmgamma.c
index 9c939eab..96068bfe 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/version.mk b/version.mk
index 4b69b3ff..091f066d 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 69
-NETPBM_POINT_RELEASE = 2
+NETPBM_POINT_RELEASE = 3
-- 
cgit 1.4.1