xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clang-tidy: use C++ casts

Browse Source 
Signed-off-by: Rosen Penev <rosenp@gmail.com>
main
Rosen Penev 3 years ago
parent f787a4c2ac
commit c2be02145d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

18
app/exiv2.cpp
Unescape Escape View File

@ -742,12 +742,12 @@ int Params::evalDelete(const std::string& optArg) {
switch (action_) { switch (action_) {
case Action::none: case Action::none:
action_ = Action::erase; action_ = Action::erase;
target_ = CommonTarget(0); target_ = static_cast<CommonTarget>(0);
// fallthrough // fallthrough
case Action::erase: { case Action::erase: {
const auto rc = parseCommonTargets(optArg, "erase"); const auto rc = parseCommonTargets(optArg, "erase");
if (rc > 0) { if (rc > 0) {
target_ |= CommonTarget(rc); target_ |= static_cast<CommonTarget>(rc);
return 0; return 0;
} else { } else {
return 1; return 1;
@ -764,12 +764,12 @@ int Params::evalExtract(const std::string& optArg) {
case Action::none: case Action::none:
case Action::modify: case Action::modify:
action_ = Action::extract; action_ = Action::extract;
target_ = CommonTarget(0); target_ = static_cast<CommonTarget>(0);
// fallthrough // fallthrough
case Action::extract: { case Action::extract: {
const auto rc = parseCommonTargets(optArg, "extract"); const auto rc = parseCommonTargets(optArg, "extract");
if (rc > 0) { if (rc > 0) {
target_ |= CommonTarget(rc); target_ |= static_cast<CommonTarget>(rc);
return 0; return 0;
} else { } else {
return 1; return 1;
@ -786,12 +786,12 @@ int Params::evalInsert(const std::string& optArg) {
case Action::none: case Action::none:
case Action::modify: case Action::modify:
action_ = Action::insert; action_ = Action::insert;
target_ = CommonTarget(0); target_ = static_cast<CommonTarget>(0);
// fallthrough // fallthrough
case Action::insert: { case Action::insert: {
const auto rc = parseCommonTargets(optArg, "insert"); const auto rc = parseCommonTargets(optArg, "insert");
if (rc > 0) { if (rc > 0) {
target_ |= CommonTarget(rc); target_ |= static_cast<CommonTarget>(rc);
return 0; return 0;
} else { } else {
return 1; return 1;
@ -1139,7 +1139,7 @@ void printUnrecognizedArgument(const char argc, const std::string& action) {
int64_t parseCommonTargets(const std::string& optArg, const std::string& action) { int64_t parseCommonTargets(const std::string& optArg, const std::string& action) {
int64_t rc = 0; int64_t rc = 0;
Params::CommonTarget target = Params::CommonTarget(0); Params::CommonTarget target = static_cast<Params::CommonTarget>(0);
Params::CommonTarget all = Params::ctExif | Params::ctIptc | Params::ctComment | Params::ctXmp; Params::CommonTarget all = Params::ctExif | Params::ctIptc | Params::ctComment | Params::ctXmp;
Params::CommonTarget extra = Params::ctXmpSidecar | Params::ctExif | Params::ctIptc | Params::ctXmp; Params::CommonTarget extra = Params::ctXmpSidecar | Params::ctExif | Params::ctIptc | Params::ctXmp;
for (size_t i = 0; rc == 0 && i < optArg.size(); ++i) { for (size_t i = 0; rc == 0 && i < optArg.size(); ++i) {
@ -1175,7 +1175,7 @@ int64_t parseCommonTargets(const std::string& optArg, const std::string& action)
target |= extra; // -eX target |= extra; // -eX
if (i > 0) { // -eXX or -iXX if (i > 0) { // -eXX or -iXX
target |= Params::ctXmpRaw; target |= Params::ctXmpRaw;
target = Params::CommonTarget(target & ~extra); // turn off those bits target = static_cast<Params::CommonTarget>(target & ~extra); // turn off those bits
} }
break; break;
@ -1196,7 +1196,7 @@ int64_t parseCommonTargets(const std::string& optArg, const std::string& action)
break; break;
} }
} }
return rc ? rc : int64_t(target); return rc ? rc : static_cast<int64_t>(target);
} }
int parsePreviewNumbers(Params::PreviewNumbers& previewNumbers, const std::string& optArg, int j) { int parsePreviewNumbers(Params::PreviewNumbers& previewNumbers, const std::string& optArg, int j) {

Write Preview
Loading…
Cancel
Save