about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-03-14 17:17:14 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-03-14 17:17:14 +0000
commitd934dea890631a08c908cdb3462d2a74dc06f4eb (patch)
treef145a5641fc436fcf603a7ae6cb60cd29cf5aecc
parentbc1dad25f16fdcecf8d49c7458667117371deacd (diff)
downloadnetpbm-mirror-d934dea890631a08c908cdb3462d2a74dc06f4eb.tar.gz
netpbm-mirror-d934dea890631a08c908cdb3462d2a74dc06f4eb.tar.xz
netpbm-mirror-d934dea890631a08c908cdb3462d2a74dc06f4eb.zip
Release 10.86.37
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@4514 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/other/pamtopng.c4
-rw-r--r--converter/other/pnmtopng.c4
-rw-r--r--doc/HISTORY8
-rw-r--r--version.mk2
4 files changed, 13 insertions, 5 deletions
diff --git a/converter/other/pamtopng.c b/converter/other/pamtopng.c
index 37ef9128..3164bc29 100644
--- a/converter/other/pamtopng.c
+++ b/converter/other/pamtopng.c
@@ -84,9 +84,9 @@ parseChromaOpt(const char *         const chromaOpt,
                    &chromaP->gx, &chromaP->gy,
                    &chromaP->bx, &chromaP->by);
 
-    if (count != 6)
+    if (count != 8)
         pm_error("Invalid syntax for the -rgb option value '%s'.  "
-                 "Should be 6 floating point number: "
+                 "Should be 8 floating point numbers: "
                  "x and y for each of white, red, green, and blue",
                  chromaOpt);
 }
diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c
index ed852fd0..cbbbc47d 100644
--- a/converter/other/pnmtopng.c
+++ b/converter/other/pnmtopng.c
@@ -192,9 +192,9 @@ parseRgbOpt(const char *         const rgbOpt,
                    &rgbP->gx, &rgbP->gy,
                    &rgbP->bx, &rgbP->by);
 
-    if (count != 6)
+    if (count != 8)
         pm_error("Invalid syntax for the -rgb option value '%s'.  "
-                 "Should be 6 floating point number: "
+                 "Should be 8 floating point numbers: "
                  "x and y for each of white, red, green, and blue",
                  rgbOpt);
 }
diff --git a/doc/HISTORY b/doc/HISTORY
index cd7139df..1164daca 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,14 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+23.03.14 BJH  Release 10.86.37
+
+              pamtopng: fix -chroma option: always rejected.  Always broken.
+              pamtopng was new in Netpbm 10.70 (June 2015).
+
+              pnmtopng: fix -rgb option: always rejected.  Always broken
+              -rgb was new in Netpbm 10.30 (October 2005).
+
 22.12.24 BJH  Release 10.86.36
 
               ppmtompeg: Fix crash with resize option because of invalid
diff --git a/version.mk b/version.mk
index 013a10a9..6a91ce52 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 86
-NETPBM_POINT_RELEASE = 36
+NETPBM_POINT_RELEASE = 37