Skip to content

Commit 7867343

Browse files
committed
fix: prefer symbolic boolean operators so windows is happy
1 parent 7bc9c01 commit 7867343

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/canonmn_int.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2747,7 +2747,7 @@ namespace Exiv2 {
27472747
ExifKey lensKey("Exif.CanonCs.Lens");
27482748
auto pos = metadata->findKey(lensKey);
27492749
// catch possible error cases
2750-
if (pos == metadata->end() or pos->value().count() < 3 or pos->value().typeId() != unsignedShort or
2750+
if (pos == metadata->end() || pos->value().count() < 3 || pos->value().typeId() != unsignedShort ||
27512751
pos->value().toFloat(2) == 0.0F) {
27522752
os << "Unknown Lens (" << lensType << ")";
27532753
}
@@ -2757,7 +2757,7 @@ namespace Exiv2 {
27572757

27582758
ExifKey aperKey("Exif.CanonCs.MaxAperture");
27592759
pos = metadata->findKey(aperKey);
2760-
if (pos == metadata->end() or pos->value().count() != 1 or pos->value().typeId() != unsignedShort) {
2760+
if (pos == metadata->end() || pos->value().count() != 1 || pos->value().typeId() != unsignedShort) {
27612761
os << "Unknown Lens (" << lensType << ")";
27622762
}
27632763

@@ -2789,7 +2789,7 @@ namespace Exiv2 {
27892789
}
27902790

27912791
std::cmatch base_match;
2792-
if (not std::regex_search(lens.label_, base_match, lens_regex)) {
2792+
if (!std::regex_search(lens.label_, base_match, lens_regex)) {
27932793
// this should never happen, as it would indicate the lens is specified incorrectly
27942794
// in the CanonCsLensType array
27952795
throw Error(kerErrorMessage, std::string("Lens regex didn't match for: ") + std::string(lens.label_));
@@ -2803,7 +2803,7 @@ namespace Exiv2 {
28032803
auto aperMaxTele = std::stof(base_match[4].str()) * tc;
28042804
auto aperMaxShort = base_match[3].length() > 0 ? std::stof(base_match[3].str()) * tc : aperMaxTele;
28052805

2806-
if (flMin != exifFlMin or flMax != exifFlMax or exifAperMax < (aperMaxShort - .1) or
2806+
if (flMin != exifFlMin || flMax != exifFlMax || exifAperMax < (aperMaxShort - .1) ||
28072807
exifAperMax > (aperMaxTele + .1)) {
28082808
continue;
28092809
}

0 commit comments

Comments
 (0)