clang-tidy: C casts to C++

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

app/exiv2.cpp

@@ -137,7 +137,7 @@ int main(int argc, char* const argv[]) {
 
   try {
     // Create the required action class
-    auto task = Action::TaskFactory::instance().create(Action::TaskType(params.action_));
+    auto task = Action::TaskFactory::instance().create(static_cast<Action::TaskType>(params.action_));
 
     // Process all files
     auto filesCount = params.files_.size();

samples/addmoddel.cpp

@@ -31,10 +31,10 @@ int main(int argc, char* const argv[]) {
     // This is the quickest way to add (simple) Exif data. If a metadatum for
     // a given key already exists, its value is overwritten. Otherwise a new
     // tag is added.
-    exifData["Exif.Image.Model"] = "Test 1";                      // AsciiValue
-    exifData["Exif.Image.SamplesPerPixel"] = uint16_t(162);       // UShortValue
-    exifData["Exif.Image.XResolution"] = -2;                      // LongValue
-    exifData["Exif.Image.YResolution"] = Exiv2::Rational(-2, 3);  // RationalValue
+    exifData["Exif.Image.Model"] = "Test 1";                              // AsciiValue
+    exifData["Exif.Image.SamplesPerPixel"] = static_cast<uint16_t>(162);  // UShortValue
+    exifData["Exif.Image.XResolution"] = -2;                              // LongValue
+    exifData["Exif.Image.YResolution"] = Exiv2::Rational(-2, 3);          // RationalValue
     std::cout << "Added a few tags the quick way.\n";
 
     // Create a ASCII string value (note the use of create)

samples/exifdata-test.cpp

@@ -34,9 +34,9 @@ int main(int argc, char* const argv[]) {
     std::cout << "Copy construction, non-intrusive changes\n";
     Exiv2::ExifData ed1(ed);
     ed1["Exif.Image.DateTime"] = "Sunday, 11am";
-    ed1["Exif.Image.Orientation"] = uint16_t(2);
+    ed1["Exif.Image.Orientation"] = static_cast<uint16_t>(2);
     ed1["Exif.Photo.DateTimeOriginal"] = "Sunday, 11am";
-    ed1["Exif.Photo.MeteringMode"] = uint16_t(1);
+    ed1["Exif.Photo.MeteringMode"] = static_cast<uint16_t>(1);
     ed1["Exif.Iop.InteroperabilityIndex"] = "123";
     //    ed1["Exif.Thumbnail.Orientation"] = uint16_t(2);
     write(file, ed1);
@@ -61,11 +61,11 @@ int main(int argc, char* const argv[]) {
     ed3["Exif.Thumbnail.Artist"] = "Test 6 Ifd1 tag";
     ed3 = ed;
     ed3["Exif.Image.DateTime"] = "Sunday, 11am";
-    ed3["Exif.Image.Orientation"] = uint16_t(2);
+    ed3["Exif.Image.Orientation"] = static_cast<uint16_t>(2);
     ed3["Exif.Photo.DateTimeOriginal"] = "Sunday, 11am";
-    ed3["Exif.Photo.MeteringMode"] = uint16_t(1);
+    ed3["Exif.Photo.MeteringMode"] = static_cast<uint16_t>(1);
     ed3["Exif.Iop.InteroperabilityIndex"] = "123";
-    ed3["Exif.Thumbnail.Orientation"] = uint16_t(2);
+    ed3["Exif.Thumbnail.Orientation"] = static_cast<uint16_t>(2);
     write(file, ed3);
     print(file);
     std::cout << "----------------------------------------------\n";
@@ -78,9 +78,9 @@ int main(int argc, char* const argv[]) {
     ed4["Exif.Image.DateTime"] = "Sunday, 11am and ten minutes";
     ed4["Exif.Image.Orientation"] = "2 3 4 5";
     ed4["Exif.Photo.DateTimeOriginal"] = "Sunday, 11am and ten minutes";
-    ed4["Exif.Photo.MeteringMode"] = uint16_t(1);
+    ed4["Exif.Photo.MeteringMode"] = static_cast<uint16_t>(1);
     ed4["Exif.Iop.InteroperabilityIndex"] = "123";
-    ed4["Exif.Thumbnail.Orientation"] = uint16_t(2);
+    ed4["Exif.Thumbnail.Orientation"] = static_cast<uint16_t>(2);
     write(file, ed4);
     print(file);
 

samples/iptceasy.cpp

@@ -23,7 +23,7 @@ int main(int argc, char* const argv[]) try {
   iptcData["Iptc.Application2.Headline"] = "The headline I am";
   iptcData["Iptc.Application2.Keywords"] = "Yet another keyword";
   iptcData["Iptc.Application2.DateCreated"] = "2004-8-3";
-  iptcData["Iptc.Application2.Urgency"] = uint16_t(1);
+  iptcData["Iptc.Application2.Urgency"] = static_cast<uint16_t>(1);
   iptcData["Iptc.Envelope.ModelVersion"] = 42;
   iptcData["Iptc.Envelope.TimeSent"] = "14:41:0-05:00";
   iptcData["Iptc.Application2.RasterizedCaption"] = "230 42 34 2 90 84 23 146";

samples/remotetest.cpp

@@ -34,12 +34,12 @@ int main(int argc, char* const argv[]) {
     // set/add metadata
     std::cout << "Modify the metadata ...\n";
     Exiv2::ExifData exifData;
-    exifData["Exif.Photo.UserComment"] = "Hello World";   // AsciiValue
-    exifData["Exif.Image.Software"] = "Exiv2";            // AsciiValue
-    exifData["Exif.Image.Copyright"] = "Exiv2";           // AsciiValue
-    exifData["Exif.Image.Make"] = "Canon";                // AsciiValue
-    exifData["Exif.Canon.OwnerName"] = "Tuan";            // UShortValue
-    exifData["Exif.CanonCs.LensType"] = uint16_t(65535);  // LongValue
+    exifData["Exif.Photo.UserComment"] = "Hello World";                // AsciiValue
+    exifData["Exif.Image.Software"] = "Exiv2";                         // AsciiValue
+    exifData["Exif.Image.Copyright"] = "Exiv2";                        // AsciiValue
+    exifData["Exif.Image.Make"] = "Canon";                             // AsciiValue
+    exifData["Exif.Canon.OwnerName"] = "Tuan";                         // UShortValue
+    exifData["Exif.CanonCs.LensType"] = static_cast<uint16_t>(65535);  // LongValue
     Exiv2::Value::UniquePtr v = Exiv2::Value::create(Exiv2::asciiString);
     v->read("2013:06:09 14:30:30");
     Exiv2::ExifKey key("Exif.Image.DateTime");

samples/write2-test.cpp

@@ -56,11 +56,11 @@ int main(int argc, char* const argv[]) {
     edMn1["Exif.Image.Make"] = "Canon";
     edMn1["Exif.Image.Model"] = "Canon PowerShot S40";
     edMn1["Exif.Canon.0xabcd"] = "A Canon makernote tag";
-    edMn1["Exif.CanonCs.0x0002"] = uint16_t(41);
-    edMn1["Exif.CanonSi.0x0005"] = uint16_t(42);
-    edMn1["Exif.CanonCf.0x0001"] = uint16_t(43);
-    edMn1["Exif.CanonPi.0x0001"] = uint16_t(44);
-    edMn1["Exif.CanonPa.0x0001"] = uint16_t(45);
+    edMn1["Exif.CanonCs.0x0002"] = static_cast<uint16_t>(41);
+    edMn1["Exif.CanonSi.0x0005"] = static_cast<uint16_t>(42);
+    edMn1["Exif.CanonCf.0x0001"] = static_cast<uint16_t>(43);
+    edMn1["Exif.CanonPi.0x0001"] = static_cast<uint16_t>(44);
+    edMn1["Exif.CanonPa.0x0001"] = static_cast<uint16_t>(45);
     write(file, edMn1);
     print(file);
 
@@ -69,8 +69,8 @@ int main(int argc, char* const argv[]) {
     image->readMetadata();
 
     Exiv2::ExifData& rEd = image->exifData();
-    rEd["Exif.CanonCs.0x0001"] = uint16_t(88);
-    rEd["Exif.CanonSi.0x0004"] = uint16_t(99);
+    rEd["Exif.CanonCs.0x0001"] = static_cast<uint16_t>(88);
+    rEd["Exif.CanonSi.0x0004"] = static_cast<uint16_t>(99);
     image->writeMetadata();
     print(file);
 
@@ -118,15 +118,15 @@ int main(int argc, char* const argv[]) {
     Exiv2::ExifData edMn7;
     edMn7["Exif.Image.Make"] = "OLYMPUS CORPORATION";
     edMn7["Exif.Image.Model"] = "C8080WZ";
-    edMn7["Exif.Olympus.0x0201"] = uint16_t(1);
+    edMn7["Exif.Olympus.0x0201"] = static_cast<uint16_t>(1);
     write(file, edMn7);
     print(file);
 
     std::cout << "\n----- One Panasonic MakerNote tag\n";
     Exiv2::ExifData edMn8;
     edMn8["Exif.Image.Make"] = "Panasonic";
     edMn8["Exif.Image.Model"] = "DMC-FZ5";
-    edMn8["Exif.Panasonic.0x0001"] = uint16_t(1);
+    edMn8["Exif.Panasonic.0x0001"] = static_cast<uint16_t>(1);
     write(file, edMn8);
     print(file);
 
@@ -142,13 +142,13 @@ int main(int argc, char* const argv[]) {
     Exiv2::ExifData edMn10;
     edMn10["Exif.Image.Make"] = "Minolta";
     edMn10["Exif.Image.Model"] = "A fancy Minolta camera";
-    edMn10["Exif.Minolta.ColorMode"] = uint32_t(1);
-    edMn10["Exif.MinoltaCsNew.WhiteBalance"] = uint32_t(2);
-    edMn10["Exif.MinoltaCs5D.WhiteBalance"] = uint16_t(3);
-    edMn10["Exif.MinoltaCs5D.ColorTemperature"] = int16_t(-1);
-    edMn10["Exif.MinoltaCs7D.WhiteBalance"] = uint16_t(4);
-    edMn10["Exif.MinoltaCs7D.ExposureCompensation"] = int16_t(-2);
-    edMn10["Exif.MinoltaCs7D.ColorTemperature"] = int16_t(-3);
+    edMn10["Exif.Minolta.ColorMode"] = static_cast<uint32_t>(1);
+    edMn10["Exif.MinoltaCsNew.WhiteBalance"] = static_cast<uint32_t>(2);
+    edMn10["Exif.MinoltaCs5D.WhiteBalance"] = static_cast<uint16_t>(3);
+    edMn10["Exif.MinoltaCs5D.ColorTemperature"] = static_cast<int16_t>(-1);
+    edMn10["Exif.MinoltaCs7D.WhiteBalance"] = static_cast<uint16_t>(4);
+    edMn10["Exif.MinoltaCs7D.ExposureCompensation"] = static_cast<int16_t>(-2);
+    edMn10["Exif.MinoltaCs7D.ColorTemperature"] = static_cast<int16_t>(-3);
     write(file, edMn10);
     print(file);
 

samples/xmpsample.cpp

@@ -40,7 +40,7 @@ int main() try {
   xmpData["Xmp.dc.one"] = -1;
   xmpData["Xmp.dc.two"] = 3.1415;
   xmpData["Xmp.dc.three"] = Exiv2::Rational(5, 7);
-  xmpData["Xmp.dc.four"] = uint16_t(255);
+  xmpData["Xmp.dc.four"] = static_cast<uint16_t>(255);
   xmpData["Xmp.dc.five"] = 256;
   xmpData["Xmp.dc.six"] = false;
 

src/convert.cpp

@@ -1584,7 +1584,7 @@ bool convertStringCharsetIconv(std::string& str, const char* from, const char* t
     size_t outbytesleft = sizeof(outbuf);
     size_t rc = iconv(cd, &inptr, &inbytesleft, &outptr, &outbytesleft);
     const size_t outbytesProduced = sizeof(outbuf) - outbytesleft;
-    if (rc == size_t(-1) && errno != E2BIG) {
+    if (rc == static_cast<size_t>(-1) && errno != E2BIG) {
 #ifndef SUPPRESS_WARNINGS
       EXV_WARNING << "iconv: " << strError() << " inbytesleft = " << inbytesleft << "\n";
 #endif

src/crwimage.cpp

@@ -108,7 +108,7 @@ void CrwParser::decode(CrwImage* pCrwImage, const byte* pData, size_t size) {
   // a hack to get absolute offset of preview image inside CRW structure
   auto preview = header.findComponent(0x2007, 0x0000);
   if (preview) {
-    (pCrwImage->exifData())["Exif.Image2.JPEGInterchangeFormat"] = uint32_t(preview->pData() - pData);
+    (pCrwImage->exifData())["Exif.Image2.JPEGInterchangeFormat"] = static_cast<uint32_t>(preview->pData() - pData);
     (pCrwImage->exifData())["Exif.Image2.JPEGInterchangeFormatLength"] = static_cast<uint32_t>(preview->size());
   }
 }  // CrwParser::decode

src/exif.cpp

@@ -301,7 +301,7 @@ int Exifdatum::ifdId() const {
 }
 
 const char* Exifdatum::ifdName() const {
-  return key_ ? Internal::ifdName(Internal::IfdId(key_->ifdId())) : "";
+  return key_ ? Internal::ifdName(static_cast<Internal::IfdId>(key_->ifdId())) : "";
 }
 
 int Exifdatum::idx() const {
@@ -422,11 +422,11 @@ void ExifThumb::setJpegThumbnail(const std::string& path) {
 }
 
 void ExifThumb::setJpegThumbnail(const byte* buf, size_t size) {
-  exifData_["Exif.Thumbnail.Compression"] = uint16_t(6);
+  exifData_["Exif.Thumbnail.Compression"] = static_cast<uint16_t>(6);
   Exifdatum& format = exifData_["Exif.Thumbnail.JPEGInterchangeFormat"];
-  format = uint32_t(0);
+  format = static_cast<uint32_t>(0);
   format.setDataArea(buf, size);
-  exifData_["Exif.Thumbnail.JPEGInterchangeFormatLength"] = uint32_t(size);
+  exifData_["Exif.Thumbnail.JPEGInterchangeFormatLength"] = static_cast<uint32_t>(size);
 }
 
 void ExifThumb::erase() {

src/http.cpp

@@ -336,7 +336,7 @@ int Exiv2::http(Exiv2::Dictionary& request, Exiv2::Dictionary& response, std::st
 
   if (n != FINISH || !OK(status)) {
     snprintf(buffer, sizeof buffer, "wsa_error = %d,n = %d,sleep_ = %d status = %d", WSAGetLastError(), n,
-             int(sleep_.count()), status);
+             static_cast<int>(sleep_.count()), status);
     error(errors, buffer, nullptr, nullptr, 0);
   } else if (bSearching && OK(status)) {
     if (end) {

src/makernote_int.cpp

@@ -1036,7 +1036,7 @@ const Exiv2::Value* getExifValue(Exiv2::Internal::TiffComponent* pRoot, const ui
 std::string getExifModel(Exiv2::Internal::TiffComponent* pRoot) {
   // Lookup the Exif.Image.Model tag
   const auto value = getExifValue(pRoot, 0x0110, Exiv2::Internal::ifd0Id);
-  return (!value || value->count() == 0) ? std::string("") : std::string(value->toString());
+  return (!value || value->count() == 0) ? std::string("") : static_cast<std::string>(value->toString());
 }
 
 void ncrypt(Exiv2::byte* pData, uint32_t size, uint32_t count, uint32_t serial) {

src/minoltamn_int.cpp

@@ -583,7 +583,7 @@ std::ostream& MinoltaMakerNote::printMinoltaExposureManualBias5D(std::ostream& o
   std::ios::fmtflags f(os.flags());
   std::ostringstream oss;
   oss.copyfmt(os);
-  os << std::fixed << std::setprecision(2) << (float(value.toInt64() - 128) / 24);
+  os << std::fixed << std::setprecision(2) << (static_cast<float>(value.toInt64() - 128) / 24);
   os.copyfmt(oss);
   os.flags(f);
   return os;
@@ -595,7 +595,7 @@ std::ostream& MinoltaMakerNote::printMinoltaExposureCompensation5D(std::ostream&
   std::ios::fmtflags f(os.flags());
   std::ostringstream oss;
   oss.copyfmt(os);
-  os << std::fixed << std::setprecision(2) << (float(value.toInt64() - 300) / 100);
+  os << std::fixed << std::setprecision(2) << (static_cast<float>(value.toInt64() - 300) / 100);
   os.copyfmt(oss);
   os.flags(f);
   return os;

src/nikonmn_int.cpp

@@ -3013,7 +3013,7 @@ std::ostream& Nikon3MakerNote::printFlashCompensation(std::ostream& os, const Va
   }
   std::ostringstream oss;
   oss.copyfmt(os);
-  float temp = (value.toFloat() / float(-6.0));
+  float temp = (value.toFloat() / static_cast<float>(-6.0));
 
   if (temp == 0)
     os << 0;
@@ -3064,7 +3064,7 @@ std::ostream& Nikon3MakerNote::printFlashGroupAData(std::ostream& os, const Valu
 
   std::ostringstream oss;
   oss.copyfmt(os);
-  double temp = value.toFloat() / double(-6.0);
+  double temp = value.toFloat() / (-6.0);
 
   auto pos = metadata->findKey(ExifKey("Exif.NikonFl7.FlashGroupAControlData"));
   if (pos == metadata->end() || pos->count() != 1 || pos->typeId() != unsignedByte) {
@@ -3100,7 +3100,7 @@ std::ostream& Nikon3MakerNote::printFlashGroupBData(std::ostream& os, const Valu
 
   std::ostringstream oss;
   oss.copyfmt(os);
-  double temp = value.toFloat() / double(-6.0);
+  double temp = value.toFloat() / (-6.0);
 
   auto pos = metadata->findKey(ExifKey("Exif.NikonFl7.FlashGroupBCControlData"));
   if (pos == metadata->end() || pos->count() != 1 || pos->typeId() != unsignedByte) {
@@ -3136,7 +3136,7 @@ std::ostream& Nikon3MakerNote::printFlashGroupCData(std::ostream& os, const Valu
 
   std::ostringstream oss;
   oss.copyfmt(os);
-  double temp = value.toFloat() / double(-6.0);
+  double temp = value.toFloat() / (-6.0);
 
   auto pos = metadata->findKey(ExifKey("Exif.NikonFl7.FlashGroupBCControlData"));
   if (pos == metadata->end() || pos->count() != 1 || pos->typeId() != unsignedByte) {
@@ -3172,8 +3172,8 @@ std::ostream& Nikon3MakerNote::printTimeZone(std::ostream& os, const Value& valu
   std::ostringstream oss;
   oss.copyfmt(os);
   char sign = value.toInt64() < 0 ? '-' : '+';
-  long h = long(std::abs(static_cast<int>(value.toFloat() / 60.0F))) % 24;
-  long min = long(std::abs(static_cast<int>(value.toFloat() - h * 60))) % 60;
+  long h = static_cast<long>(std::abs(static_cast<int>(value.toFloat() / 60.0F))) % 24;
+  long min = static_cast<long>(std::abs(static_cast<int>(value.toFloat() - h * 60))) % 60;
   os << std::fixed << "UTC " << sign << std::setw(2) << std::setfill('0') << h << ":" << std::setw(2)
      << std::setfill('0') << min;
   os.copyfmt(oss);

src/pngimage.cpp

@@ -224,7 +224,7 @@ void PngImage::printStructure(std::ostream& out, PrintStructureOption option, in
 
       // test that we haven't hit EOF, or wanting to read excessive data
       long restore = io_->tell();
-      if (restore == -1 || dataOffset > uint32_t(0x7FFFFFFF) || dataOffset > imgSize - restore) {
+      if (restore == -1 || dataOffset > static_cast<uint32_t>(0x7FFFFFFF) || dataOffset > imgSize - restore) {
         throw Exiv2::Error(ErrorCode::kerFailedToReadImageData);
       }
 
@@ -408,7 +408,7 @@ void PngImage::readMetadata() {
     // Decode chunk data length.
     uint32_t chunkLength = cheaderBuf.read_uint32(0, Exiv2::bigEndian);
     long pos = io_->tell();
-    if (pos == -1 || chunkLength > uint32_t(0x7FFFFFFF) || chunkLength > imgSize - pos) {
+    if (pos == -1 || chunkLength > static_cast<uint32_t>(0x7FFFFFFF) || chunkLength > imgSize - pos) {
       throw Exiv2::Error(ErrorCode::kerFailedToReadImageData);
     }
 

src/preview.cpp

@@ -349,7 +349,7 @@ PreviewProperties Loader::getProperties() const {
 }
 
 PreviewId Loader::getNumLoaders() {
-  return PreviewId(std::size(loaderList_));
+  return static_cast<PreviewId>(std::size(loaderList_));
 }
 
 LoaderNative::LoaderNative(PreviewId id, const Image& image, int parIdx) : Loader(id, image) {
@@ -753,7 +753,7 @@ DataBuf LoaderTiff::getData() const {
 
   // Fix compression value in the CR2 IFD2 image
   if (0 == strcmp(group_, "Image2") && image_.mimeType() == "image/x-canon-cr2") {
-    preview["Exif.Image.Compression"] = uint16_t(1);
+    preview["Exif.Image.Compression"] = static_cast<uint16_t>(1);
   }
 
   // write new image

src/safe_op.hpp

@@ -46,7 +46,7 @@ namespace Internal {
  */
 template <typename T>
 struct is_signed {
-  enum { VALUE = T(-1) < T(0) };
+  enum { VALUE = static_cast<T>(-1) < static_cast<T>(0) };
 };
 
 /*!