use more std::min and remove ostringstream

Signed-off-by: Rosen Penev <[email protected]>

src/image.cpp

@@ -393,13 +393,9 @@ void Image::printIFDStructure(BasicIo& io, std::ostream& out, Exiv2::PrintStruct
           return count;
         // restrict long arrays
         if (isStringType(type)) {
-          if (count > 32u)
-            return 32u;
-          return count;
+          return std::min(count, 32u);
         }
-        if (count > 5u)
-          return 5u;
-        return count;
+        return std::min(count, 5u);
       }();
       uint32_t pad = isStringType(type) ? 1 : 0;
       size_t size = [=] {

src/types.cpp

@@ -459,14 +459,14 @@ void hexdump(std::ostream& os, const byte* buf, size_t len, size_t offset) {
   size_t i = 0;
   while (i < len) {
     os << "  " << std::setw(4) << std::setfill('0') << std::hex << i + offset << "  ";
-    std::ostringstream ss;
+    std::string ss;
     do {
       byte c = buf[i];
       os << std::setw(2) << std::setfill('0') << std::right << std::hex << static_cast<int>(c) << " ";
-      ss << (static_cast<int>(c) >= 31 && static_cast<int>(c) < 127 ? static_cast<char>(buf[i]) : '.');
+      ss += (std::isprint(static_cast<int>(c)) ? static_cast<char>(buf[i]) : '.');
     } while (++i < len && i % 16 != 0);
     std::string::size_type width = 9 + (((i - 1) % 16 + 1) * 3);
-    os << (width > pos ? "" : align.substr(width)) << ss.str() << "\n";
+    os << (width > pos ? "" : align.substr(width)) << ss << "\n";
   }
   os << std::dec << std::setfill(' ');
   os.flags(f);