about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2015-05-30 21:22:55 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2015-05-30 21:22:55 +0000
commitc268270f972136a46650325c2c06b479493740ba (patch)
tree6d5c0bb9f74ad43d8bce0d8c3227f4b99ef308af
parentd9d3f9a83349ecc6a4c7af941aa5f0f240240fac (diff)
downloadnetpbm-mirror-c268270f972136a46650325c2c06b479493740ba.tar.gz
netpbm-mirror-c268270f972136a46650325c2c06b479493740ba.tar.xz
netpbm-mirror-c268270f972136a46650325c2c06b479493740ba.zip
Fix -protocol: change OPT_UINT to OPT_STRING
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2534 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/pbm/pbmtoepson.c2
-rw-r--r--doc/HISTORY4
2 files changed, 5 insertions, 1 deletions
diff --git a/converter/pbm/pbmtoepson.c b/converter/pbm/pbmtoepson.c
index 762c6858..8e9d75a9 100644
--- a/converter/pbm/pbmtoepson.c
+++ b/converter/pbm/pbmtoepson.c
@@ -69,7 +69,7 @@ parseCommandLine(int                 argc,
     MALLOCARRAY_NOFAIL(option_def, 100);
 
     option_def_index = 0;   /* incremented by OPTENT3 */
-    OPTENT3(0, "protocol",   OPT_UINT,   &protocol,
+    OPTENT3(0, "protocol",   OPT_STRING,   &protocol,
             &protocolSpec,                    0);
     OPTENT3(0, "dpi",        OPT_UINT,   &cmdlineP->dpi,
             &dpiSpec,                    0);
diff --git a/doc/HISTORY b/doc/HISTORY
index 00143e06..cea893a7 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -6,6 +6,10 @@ CHANGE HISTORY
 
 not yet  BJH  Release 10.71.00
 
+              pbmtoepson: fix -protocol option - never works and sometimes
+              crashes program.  Always broken (-protocol was new in Netpbm
+              10.23 (July 2004).
+
               sbigtopgm: fix detection of camera type.  Always broken
               (sbigtopgm was new in Netpbm 8.3 (March 2000)).