use isgreater

src/canonmn_int.cpp

@@ -2798,7 +2798,7 @@ std::ostream& CanonMakerNote::printFocalLength(std::ostream& os, const Value& va
   auto pos = metadata->findKey(key);
   if (pos != metadata->end() && pos->value().count() >= 3 && pos->value().typeId() == unsignedShort) {
     float fu = pos->value().toFloat(2);
-    if (fu != 0.0F) {
+    if (std::isgreater(fu, 0.0F)) {
       return os << stringFormat("{:.1f} mm", value.toFloat(1) / fu);
     }
   }
@@ -3007,14 +3007,15 @@ std::ostream& CanonMakerNote::printCsLens(std::ostream& os, const Value& value,
   }
 
   float fu = value.toFloat(2);
-  if (fu == 0.0F)
-    return os << value;
-  float len1 = value.toInt64(0) / fu;
-  float len2 = value.toInt64(1) / fu;
-  if (len1 == len2) {
-    return os << stringFormat("{:.1f} mm", len1);
+  if (std::isgreater(fu, 0.0F)) {
+    float len1 = value.toInt64(0) / fu;
+    float len2 = value.toInt64(1) / fu;
+    if (len1 == len2) {
+      return os << stringFormat("{:.1f} mm", len1);
+    }
+    return os << stringFormat("{:.1f} - {:.1f} mm", len2, len1);
   }
-  return os << stringFormat("{:.1f} - {:.1f} mm", len2, len1);
+  return os << value;
 }
 
 std::ostream& CanonMakerNote::printLe0x0000(std::ostream& os, const Value& value, const ExifData*) {

src/matroskavideo.cpp

@@ -884,7 +884,7 @@ void MatroskaVideo::decodeFloatTags(const MatroskaTag* tag, const byte* buf) {
           default:
             break;
         }
-        if (frame_rate > 0.0)
+        if (std::isgreater(frame_rate, 0.0))
           xmpData_[internalMt->_label] = frame_rate;
       } else
         xmpData_[tag->_label] = "Variable Bit Rate";

src/olympusmn_int.cpp

@@ -1280,9 +1280,9 @@ std::ostream& OlympusMakerNote::print0x0204(std::ostream& os, const Value& value
     return os << "(" << value << ")";
   }
   float f = value.toFloat();
-  if (f == 0.0F || f == 1.0F)
-    return os << _("None");
-  return os << stringFormat("{:.1f}x", f);
+  if (std::isgreater(f, 1.0F))
+    return os << stringFormat("{:.1f}x", f);
+  return os << _("None");
 }  // OlympusMakerNote::print0x0204
 
 std::ostream& OlympusMakerNote::print0x1015(std::ostream& os, const Value& value, const ExifData*) {

src/tags_int.cpp

@@ -2737,7 +2737,8 @@ std::ostream& printLensSpecification(std::ostream& os, const Value& value, const
     fNumber2 = value.toFloat(3);
 
   // first value must not be bigger than second
-  if ((focalLength1 > focalLength2 && focalLength2 > 0.0f) || (fNumber1 > fNumber2 && fNumber2 > 0.0f)) {
+  if ((std::isgreater(focalLength1, focalLength2) && std::isgreater(focalLength2, 0.0f)) ||
+      (std::isgreater(fNumber1, fNumber2) && std::isgreater(fNumber2, 0.0f))) {
     os << "(" << value << ")";
     return os;
   }
@@ -2749,31 +2750,31 @@ std::ostream& printLensSpecification(std::ostream& os, const Value& value, const
   }
 
   // lens specification available - at least parts
-  if (focalLength1 == 0.0f)
-    os << "n/a";
-  else
+  if (std::isgreater(focalLength1, 0.0f))
     os << std::setprecision(5) << focalLength1;
+  else
+    os << "n/a";
   if (focalLength1 != focalLength2) {
-    if (focalLength2 == 0.0f)
-      os << "-n/a ";
-    else
+    if (std::isgreater(focalLength2, 0.0f))
       os << "-" << std::setprecision(5) << focalLength2;
+    else
+      os << "-n/a ";
   }
   os << "mm";
   std::ostringstream oss;
   oss.copyfmt(os);
 
-  if (fNumber1 > 0.0f || fNumber2 > 0.0f) {
+  if (std::isgreater(fNumber1, 0.0f) || std::isgreater(fNumber2, 0.0f)) {
     os << " F";
-    if (fNumber1 == 0.0f)
-      os << " n/a";
-    else
+    if (std::isgreater(fNumber1, 0.0f))
       os << std::setprecision(2) << fNumber1;
+    else
+      os << " n/a";
     if (fNumber1 != fNumber2) {
-      if (fNumber2 == 0.0f)
-        os << "-n/a";
-      else
+      if (std::isgreater(fNumber2, 0.0f))
         os << "-" << std::setprecision(2) << fNumber2;
+      else
+        os << "-n/a";
     }
   }
   os.copyfmt(oss);