about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-08-24 21:48:49 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2023-08-24 21:48:49 +0000
commit79437a673ce781866f292032d7257d35c2010166 (patch)
tree0e54e7cbe75af7a80ec11c5d85e06d75f82b586d
parent13360c93975be772b2805a8bc445c5b8cd63d95d (diff)
downloadnetpbm-mirror-79437a673ce781866f292032d7257d35c2010166.tar.gz
netpbm-mirror-79437a673ce781866f292032d7257d35c2010166.tar.xz
netpbm-mirror-79437a673ce781866f292032d7257d35c2010166.zip
Fix error message
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4613 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/other/pbmtopgm.c2
-rw-r--r--doc/HISTORY2
2 files changed, 3 insertions, 1 deletions
diff --git a/converter/other/pbmtopgm.c b/converter/other/pbmtopgm.c
index 817fb5b3..72a2afff 100644
--- a/converter/other/pbmtopgm.c
+++ b/converter/other/pbmtopgm.c
@@ -45,7 +45,7 @@ main(int argc, char *argv[]) {
 
     if (width > cols)
         pm_error("You specified a sample width (%u columns) which is greater "
-                 "than the image width (%u columns)", height, rows);
+                 "than the image width (%u columns)", width, cols);
     if (height > rows)
         pm_error("You specified a sample height (%u rows) which is greater "
                  "than the image height (%u rows)", height, rows);
diff --git a/doc/HISTORY b/doc/HISTORY
index 318053e3..1762be61 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -54,6 +54,8 @@ not yet  BJH  Release 11.04.00
               pgmtexture: Fix bug: ignores -d.  Introduced in Netpbm 10.56
               (September 2011).
 
+              pbmtopgm: Fix error message for excessive -width.
+
               library: add check of maxval for computable size.
 
               Build: Include LDFLAGS in link of shared library.