about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-03-14 17:14:13 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-03-14 17:14:13 +0000
commit1759de8c37fa4b19b02670e48daf211a62519074 (patch)
tree8709f8a9febb3a817869ffea3aa55ad702cf3b50
parenta70405848cb06782036364a88e27f452fb0a0b32 (diff)
downloadnetpbm-mirror-1759de8c37fa4b19b02670e48daf211a62519074.tar.gz
netpbm-mirror-1759de8c37fa4b19b02670e48daf211a62519074.tar.xz
netpbm-mirror-1759de8c37fa4b19b02670e48daf211a62519074.zip
Release 11.01.01
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4513 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 b61ab17b..088db3c8 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 23bd7d66..2230d226 100644
--- a/converter/other/pnmtopng.c
+++ b/converter/other/pnmtopng.c
@@ -187,9 +187,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 2cd5c1c6..532d974d 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,14 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+23.03.14 BJH  Release 11.01.01
+
+              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.31 BJH  Release 11.01.00
 
               pamcat: Add -listfile .
diff --git a/version.mk b/version.mk
index d8a3f352..269e5d8f 100644
--- a/version.mk
+++ b/version.mk
@@ -1,3 +1,3 @@
 NETPBM_MAJOR_RELEASE = 11
 NETPBM_MINOR_RELEASE = 1
-NETPBM_POINT_RELEASE = 0
+NETPBM_POINT_RELEASE = 1