Fix 547: option -pR only available in Debug mode.

Note that the method Params::evalPrint() has been clang-formatted.
v0.27.3
Luis Díaz Más 7 years ago
parent dee30a8c8f
commit 34e411d2fc

@ -595,41 +595,79 @@ int Params::evalPrint(const std::string& optarg)
{ {
int rc = 0; int rc = 0;
switch (action_) { switch (action_) {
case Action::none: case Action::none:
switch (optarg[0]) { switch (optarg[0]) {
case 's': action_ = Action::print; printMode_ = pmSummary; break; case 's':
case 'a': rc = evalPrintFlags("kyct"); break; action_ = Action::print;
case 'e': rc = evalPrintFlags("Ekycv"); break; printMode_ = pmSummary;
case 't': rc = evalPrintFlags("Ekyct"); break; break;
case 'v': rc = evalPrintFlags("Exgnycv"); break; case 'a':
case 'h': rc = evalPrintFlags("Exgnycsh"); break; rc = evalPrintFlags("kyct");
case 'i': rc = evalPrintFlags("Ikyct"); break; break;
case 'x': rc = evalPrintFlags("Xkyct"); break; case 'e':
case 'c': action_ = Action::print; printMode_ = pmComment ; break; rc = evalPrintFlags("Ekycv");
case 'p': action_ = Action::print; printMode_ = pmPreview ; break; break;
case 'C': action_ = Action::print; printMode_ = pmIccProfile ; break; case 't':
case 'R': action_ = Action::print; printMode_ = pmRecursive ; break; rc = evalPrintFlags("Ekyct");
case 'S': action_ = Action::print; printMode_ = pmStructure ; break; break;
case 'X': action_ = Action::print; printMode_ = pmXMP ; break; case 'v':
rc = evalPrintFlags("Exgnycv");
break;
case 'h':
rc = evalPrintFlags("Exgnycsh");
break;
case 'i':
rc = evalPrintFlags("Ikyct");
break;
case 'x':
rc = evalPrintFlags("Xkyct");
break;
case 'c':
action_ = Action::print;
printMode_ = pmComment;
break;
case 'p':
action_ = Action::print;
printMode_ = pmPreview;
break;
case 'C':
action_ = Action::print;
printMode_ = pmIccProfile;
break;
case 'R':
#ifdef NDEBUG
std::cerr << progname() << ": " << _("Action not available in Release mode")
<< ": '" << optarg << "'\n";
rc = 1;
#else
action_ = Action::print;
printMode_ = pmRecursive;
#endif
break;
case 'S':
action_ = Action::print;
printMode_ = pmStructure;
break;
case 'X':
action_ = Action::print;
printMode_ = pmXMP;
break;
default:
std::cerr << progname() << ": " << _("Unrecognized print mode") << " `" << optarg << "'\n";
rc = 1;
break;
}
break;
case Action::print:
std::cerr << progname() << ": " << _("Ignoring surplus option -p") << optarg << "\n";
break;
default: default:
std::cerr << progname() << ": " << _("Unrecognized print mode") << " `" std::cerr << progname() << ": " << _("Option -p is not compatible with a previous option\n");
<< optarg << "'\n";
rc = 1; rc = 1;
break; break;
}
break;
case Action::print:
std::cerr << progname() << ": "
<< _("Ignoring surplus option -p") << optarg << "\n";
break;
default:
std::cerr << progname() << ": "
<< _("Option -p is not compatible with a previous option\n");
rc = 1;
break;
} }
return rc; return rc;
} // Params::evalPrint } // Params::evalPrint
int Params::evalPrintFlags(const std::string& optarg) int Params::evalPrintFlags(const std::string& optarg)
{ {

Loading…
Cancel
Save