remove some stringstreams

Looks like they're slow under Cygwin.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

Author: neheb

samples/iptctest.cpp

@@ -86,7 +86,7 @@ void processAdd(const std::string& line, int num, IptcData& iptcData) {
 
   std::string data(line.substr(dataStart));
   // if data starts and ends with quotes, remove them
-  if (data.front() == '\"' && data.back() == '\"') {
+  if (data.front() == '"' && data.back() == '"') {
     data = data.substr(1, data.size() - 2);
   }
   TypeId type = IptcDataSets::dataSetType(iptcKey.tag(), iptcKey.record());
@@ -133,7 +133,7 @@ void processModify(const std::string& line, int num, IptcData& iptcData) {
 
   std::string data(line.substr(dataStart));
   // if data starts and ends with quotes, remove them
-  if (data.front() == '\"' && data.back() == '\"') {
+  if (data.front() == '"' && data.back() == '"') {
     data = data.substr(1, data.size() - 2);
   }
   TypeId type = IptcDataSets::dataSetType(iptcKey.tag(), iptcKey.record());

src/canonmn_int.cpp

@@ -11,6 +11,7 @@
 #include "error.hpp"
 #include "exif.hpp"
 #include "i18n.h"  // NLS support.
+#include "image_int.hpp"
 #include "makernote_int.hpp"
 #include "tags_int.hpp"
 #include "types.hpp"
@@ -2776,9 +2777,7 @@ std::ostream& CanonMakerNote::printFiFileNumber(std::ostream& os, const Value& v
   if (Internal::contains(model, "20D") || Internal::contains(model, "350D") ||
       model.substr(model.size() - 8, 8) == "REBEL XT" || Internal::contains(model, "Kiss Digital N")) {
     uint32_t val = value.toUint32();
-    uint32_t dn = (val & 0xffc0) >> 6;
-    uint32_t fn = ((val >> 16) & 0xff) + ((val & 0x3f) << 8);
-    os << std::dec << dn << "-" << std::setw(4) << std::setfill('0') << fn;
+    os << stringFormat("{}-{:04}", (val & 0xffc0) >> 6, ((val >> 16) & 0xff) + ((val & 0x3f) << 8));
     os.flags(f);
     return os;
   }
@@ -2788,8 +2787,7 @@ std::ostream& CanonMakerNote::printFiFileNumber(std::ostream& os, const Value& v
     uint32_t dn = (val & 0xffc00) >> 10;
     while (dn < 100)
       dn += 0x40;
-    uint32_t fn = ((val & 0x3ff) << 4) + ((val >> 20) & 0x0f);
-    os << std::dec << dn << "-" << std::setw(4) << std::setfill('0') << fn;
+    os << stringFormat("{}-{:04}", dn, ((val & 0x3ff) << 4) + ((val >> 20) & 0x0f));
     os.flags(f);
     return os;
   }
@@ -2833,16 +2831,11 @@ std::ostream& CanonMakerNote::print0x0008(std::ostream& os, const Value& value,
 }
 
 std::ostream& CanonMakerNote::print0x000a(std::ostream& os, const Value& value, const ExifData*) {
-  std::istringstream is(value.toString());
-  uint32_t l = 0;
-  is >> l;
-  return os << std::setw(4) << std::setfill('0') << std::hex << ((l & 0xffff0000) >> 16) << std::setw(5)
-            << std::setfill('0') << std::dec << (l & 0x0000ffff);
+  uint32_t l = std::stoul(value.toString());
+  return os << stringFormat("{:04x}{:05}", (l >> 16) & 0xFFFF, l & 0xFFFF);
 }
 
 std::ostream& CanonMakerNote::print0x000c(std::ostream& os, const Value& value, const ExifData* exifData) {
-  std::istringstream is(value.toString());
-
   if (!exifData) {
     return os << value;
   }
@@ -2851,10 +2844,8 @@ std::ostream& CanonMakerNote::print0x000c(std::ostream& os, const Value& value,
   auto pos = exifData->findKey(key);
   // if model is EOS D30
   if (pos != exifData->end() && pos->value().count() == 1 && pos->value().toInt64() == 0x01140000) {
-    uint32_t l = 0;
-    is >> l;
-    return os << std::setw(4) << std::setfill('0') << std::hex << ((l & 0xffff0000) >> 16) << std::setw(5)
-              << std::setfill('0') << std::dec << (l & 0x0000ffff);
+    uint32_t l = std::stoul(value.toString());
+    return os << stringFormat("{:04x}{:05}", (l >> 16) & 0xFFFF, l & 0xFFFF);
   }
   return os << value;
 }
@@ -3061,7 +3052,7 @@ std::ostream& CanonMakerNote::printLe0x0000(std::ostream& os, const Value& value
   std::ostringstream oss;
   oss.copyfmt(os);
   for (size_t i = 0; i < value.size(); ++i) {
-    os << std::setw(2) << std::setfill('0') << std::hex << value.toInt64(i);
+    os << stringFormat("{:02x}", value.toInt64(i));
   }
   os.copyfmt(oss);
   os.flags(f);

src/convert.cpp

@@ -742,11 +742,13 @@ void Converter::cnvExifVersion(const char* from, const char* to) {
     return;
   if (!prepareXmpTarget(to))
     return;
-  std::ostringstream value;
-  for (size_t i = 0; i < pos->count(); ++i) {
-    value << static_cast<char>(pos->toInt64(i));
+  auto count = pos->count();
+  std::string value;
+  value.reserve(count);
+  for (size_t i = 0; i < count; ++i) {
+    value += static_cast<char>(pos->toInt64(i));
   }
-  (*xmpData_)[to] = value.str();
+  (*xmpData_)[to] = value;
   if (erase_)
     exifData_->erase(pos);
 }
@@ -757,13 +759,13 @@ void Converter::cnvExifGPSVersion(const char* from, const char* to) {
     return;
   if (!prepareXmpTarget(to))
     return;
-  std::ostringstream value;
+  std::string value;
   for (size_t i = 0; i < pos->count(); ++i) {
     if (i > 0)
-      value << '.';
-    value << pos->toInt64(i);
+      value += '.';
+    value += std::to_string(pos->toInt64(i));
   }
-  (*xmpData_)[to] = value.str();
+  (*xmpData_)[to] = value;
   if (erase_)
     exifData_->erase(pos);
 }
@@ -826,9 +828,7 @@ void Converter::cnvExifGPSCoord(const char* from, const char* to) {
   double min = (deg[0] * 60.0) + deg[1] + (deg[2] / 60.0);
   auto ideg = static_cast<int>(min / 60.0);
   min -= ideg * 60;
-  std::ostringstream oss;
-  oss << ideg << "," << std::fixed << std::setprecision(7) << min << refPos->toString().c_str()[0];
-  (*xmpData_)[to] = oss.str();
+  (*xmpData_)[to] = stringFormat("{},{:.7f}{}", ideg, min, refPos->toString().front());
 
   if (erase_)
     exifData_->erase(pos);
@@ -883,7 +883,7 @@ void Converter::cnvXmpArray(const char* from, const char* to) {
   auto pos = xmpData_->findKey(XmpKey(from));
   if (pos == xmpData_->end())
     return;
-  std::ostringstream array;
+  std::string array;
   for (size_t i = 0; i < pos->count(); ++i) {
     std::string value = pos->toString(i);
     if (!pos->value().ok()) {
@@ -892,11 +892,11 @@ void Converter::cnvXmpArray(const char* from, const char* to) {
 #endif
       return;
     }
-    array << value;
+    array += value;
     if (i != pos->count() - 1)
-      array << " ";
+      array += " ";
   }
-  (*exifData_)[to] = array.str();
+  (*exifData_)[to] = array;
   if (erase_)
     xmpData_->erase(pos);
 }
@@ -997,12 +997,9 @@ void Converter::cnvXmpVersion(const char* from, const char* to) {
 #endif
     return;
   }
-  std::ostringstream array;
 
-  array << static_cast<int>(value[0]) << " " << static_cast<int>(value[1]) << " " << static_cast<int>(value[2]) << " "
-        << static_cast<int>(value[3]);
-
-  (*exifData_)[to] = array.str();
+  (*exifData_)[to] = stringFormat("{} {} {} {}", static_cast<int>(value[0]), static_cast<int>(value[1]),
+                                  static_cast<int>(value[2]), static_cast<int>(value[3]));
   if (erase_)
     xmpData_->erase(pos);
 }
@@ -1234,7 +1231,7 @@ void Converter::cnvXmpValueToIptc(const char* from, const char* to) {
 
 #ifdef EXV_HAVE_XMP_TOOLKIT
 std::string Converter::computeExifDigest(bool tiff) {
-  std::ostringstream res;
+  std::string res;
   MD5_CTX context;
   unsigned char digest[16];
 
@@ -1247,9 +1244,9 @@ std::string Converter::computeExifDigest(bool tiff) {
       if (!tiff && key.groupName() == "Image")
         continue;
 
-      if (!res.str().empty())
-        res << ',';
-      res << key.tag();
+      if (!res.empty())
+        res += ',';
+      res += key.tag();
       auto pos = exifData_->findKey(key);
       if (pos == exifData_->end())
         continue;
@@ -1259,12 +1256,11 @@ std::string Converter::computeExifDigest(bool tiff) {
     }
   }
   MD5Final(digest, &context);
-  res << ';';
-  res << std::setw(2) << std::setfill('0') << std::hex << std::uppercase;
+  res += ';';
   for (const auto& i : digest) {
-    res << static_cast<int>(i);
+    res += stringFormat("{:02X}", i);
   }
-  return res.str();
+  return res;
 }
 #else
 std::string Converter::computeExifDigest(bool) {

src/crwimage_int.cpp

@@ -5,6 +5,7 @@
 #include "enforce.hpp"
 #include "error.hpp"
 #include "i18n.h"  // NLS support.
+#include "image_int.hpp"
 
 #include <algorithm>
 #include <ctime>
@@ -420,10 +421,8 @@ void CiffComponent::print(std::ostream& os, ByteOrder byteOrder, const std::stri
 }
 
 void CiffComponent::doPrint(std::ostream& os, ByteOrder byteOrder, const std::string& prefix) const {
-  os << prefix << _("tag") << " = 0x" << std::setw(4) << std::setfill('0') << std::hex << std::right << tagId() << ", "
-     << _("dir") << " = 0x" << std::setw(4) << std::setfill('0') << std::hex << std::right << dir() << ", " << _("type")
-     << " = " << TypeInfo::typeName(typeId()) << ", " << _("size") << " = " << std::dec << size_ << ", " << _("offset")
-     << " = " << offset_ << "\n";
+  os << stringFormat("{}{} = 0x{:04x}, {} = 0x{:04x}, {} = {}, {} = {}, {} = {}\n", prefix, _("tag"), tagId(), _("dir"),
+                     dir(), _("type"), TypeInfo::typeName(typeId()), _("size"), size_, _("offset"), offset_);
 
   if (typeId() != directory) {
     auto value = Value::create(typeId());

src/datasets.cpp

@@ -443,17 +443,13 @@ bool IptcDataSets::dataSetRepeatable(uint16_t number, uint16_t recordId) {
 }
 
 uint16_t IptcDataSets::dataSet(const std::string& dataSetName, uint16_t recordId) {
-  uint16_t dataSet = 0;
   if (int idx = dataSetIdx(dataSetName, recordId); idx != -1) {
     // dataSetIdx checks the range of recordId
-    dataSet = records_[recordId][idx].number_;
-  } else {
-    if (!isHex(dataSetName, 4, "0x"))
-      throw Error(ErrorCode::kerInvalidDataset, dataSetName);
-    std::istringstream is(dataSetName);
-    is >> std::hex >> dataSet;
+    return records_[recordId][idx].number_;
   }
-  return dataSet;
+  if (!isHex(dataSetName, 4, "0x"))
+    throw Error(ErrorCode::kerInvalidDataset, dataSetName);
+  return std::stoi(dataSetName, nullptr, 16);
 }
 
 std::string IptcDataSets::recordName(uint16_t recordId) {
@@ -480,8 +476,7 @@ uint16_t IptcDataSets::recordId(const std::string& recordName) {
   if (i == 0) {
     if (!isHex(recordName, 4, "0x"))
       throw Error(ErrorCode::kerInvalidRecord, recordName);
-    std::istringstream is(recordName);
-    is >> std::hex >> i;
+    i = std::stoi(recordName, nullptr, 16);
   }
   return i;
 }
@@ -594,15 +589,16 @@ std::ostream& operator<<(std::ostream& os, const DataSet& dataSet) {
      << iptcKey.key() << ", " << TypeInfo::typeName(IptcDataSets::dataSetType(dataSet.number_, dataSet.recordId_))
      << ", ";
   // CSV encoded I am \"dead\" beat" => "I am ""dead"" beat"
-  char Q = '"';
-  os << Q;
-  for (size_t i = 0; i < ::strlen(dataSet.desc_); i++) {
-    char c = dataSet.desc_[i];
-    if (c == Q)
-      os << Q;
-    os << c;
+  std::string escapedDesc;
+  escapedDesc.push_back('"');
+  for (char c : std::string_view(dataSet.desc_)) {
+    if (c == '"')
+      escapedDesc += "\"\"";
+    else
+      escapedDesc.push_back(c);
   }
-  os << Q;
+  escapedDesc.push_back('"');
+  os << escapedDesc;
   os.flags(f);
   return os;
 }

src/futils.cpp

@@ -5,6 +5,7 @@
 
 #include "config.h"
 #include "enforce.hpp"
+#include "image_int.hpp"
 #include "utils.hpp"
 
 // + standard includes
@@ -240,7 +241,7 @@ bool fileExists(const std::string& path) {
 
 std::string strError() {
   int error = errno;
-  std::ostringstream os;
+  std::string os;
 #ifdef EXV_HAVE_STRERROR_R
   const size_t n = 1024;
 #ifdef EXV_STRERROR_R_CHAR_P
@@ -251,17 +252,16 @@ std::string strError() {
   const int ret = strerror_r(error, buf, n);
   Internal::enforce(ret != ERANGE, Exiv2::ErrorCode::kerCallFailed);
 #endif
-  os << buf;
+  os = buf;
   // Issue# 908.
   // report strerror() if strerror_r() returns empty
-  if (!buf[0]) {
-    os << strerror(error);
+  if (os.empty()) {
+    os = std::strerror(error);
   }
 #else
-  os << std::strerror(error);
+  os = std::strerror(error);
 #endif
-  os << " (errno = " << error << ")";
-  return os.str();
+  return stringFormat("{} (errno = {})", os, error);
 }  // strError
 
 void Uri::Decode(Uri& uri) {

src/pngchunk_int.cpp

@@ -11,6 +11,7 @@
 #include "exif.hpp"
 #include "helper_functions.hpp"
 #include "image.hpp"
+#include "image_int.hpp"
 #include "iptc.hpp"
 #include "photoshop.hpp"
 #include "pngchunk_int.hpp"
@@ -576,17 +577,16 @@ DataBuf PngChunk::readRawProfile(const DataBuf& text, bool iTXt) {
 std::string PngChunk::writeRawProfile(const std::string& profileData, const char* profileType) {
   static const byte hex[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
 
-  std::ostringstream oss;
-  oss << '\n' << profileType << '\n' << std::setw(8) << profileData.size();
+  auto ss = stringFormat("\n{}\n{:08}", profileType, profileData.size());
   auto sp = reinterpret_cast<const byte*>(profileData.data());
   for (std::string::size_type i = 0; i < profileData.size(); ++i) {
     if (i % 36 == 0)
-      oss << '\n';
-    oss << hex[*sp >> 4 & 0x0fU];
-    oss << hex[*sp++ & 0x0fU];
+      ss += '\n';
+    ss += hex[*sp >> 4 & 0x0fU];
+    ss += hex[*sp++ & 0x0fU];
   }
-  oss << '\n';
-  return oss.str();
+  ss += '\n';
+  return ss;
 
 }  // PngChunk::writeRawProfile