From c268270f972136a46650325c2c06b479493740ba Mon Sep 17 00:00:00 2001 From: giraffedata Date: Sat, 30 May 2015 21:22:55 +0000 Subject: 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 --- converter/pbm/pbmtoepson.c | 2 +- doc/HISTORY | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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)). -- cgit 1.4.1