clang-format adjustments (backport #3045)

cmake/Doxyfile.in

@@ -830,7 +830,6 @@ EXCLUDE                = @ROOTDIR@/samples/Jzon.h \
                          @ROOTDIR@/src/getopt.hpp \
                          @ROOTDIR@/src/localtime.c \
                          @ROOTDIR@/src/fff.h \
-                         @ROOTDIR@/src/private.h \
                          @ROOTDIR@/src/timegm.h \
                          @ROOTDIR@/src/tzfile.h \
                          @ROOTDIR@/src/unused.h \

include/exiv2/datasets.hpp

@@ -39,7 +39,7 @@ struct EXIV2API DataSet {
   TypeId type_;            //!< Exiv2 default type
   uint16_t recordId_;      //!< Record id
   const char* photoshop_;  //!< Photoshop string
-};                         // struct DataSet
+};
 
 //! IPTC dataset reference, implemented as a static class.
 class EXIV2API IptcDataSets {

include/exiv2/tags.hpp

@@ -231,7 +231,7 @@ struct EXIV2API TagInfo {
   TypeId typeId_;        //!< Type id
   int16_t count_;        //!< The number of values (not bytes!), 0=any, -1=count not known.
   PrintFct printFct_;    //!< Pointer to tag print function
-};                       // struct TagInfo
+};
 
 //! Access to Exif group and tag lists and misc. tag reference methods, implemented as a static class.
 class EXIV2API ExifTags {

include/exiv2/value.hpp

@@ -468,7 +468,7 @@ class EXIV2API CommentValue : public StringValueBase {
     CharsetId charsetId_;  //!< Charset id
     const char* name_;     //!< Name of the charset
     const char* code_;     //!< Code of the charset
-  };                       // struct CharsetTable
+  };
 
   //! Charset information lookup functions. Implemented as a static class.
   class EXIV2API CharsetInfo {

src/bmffimage.cpp

@@ -91,8 +91,8 @@ std::string BmffImage::toAscii(uint32_t n) {
   // show 0 as _
   std::replace(result.begin(), result.end(), '\0', '_');
   // show non 7-bit printable ascii as .
-  std::replace_if(
-      result.begin(), result.end(), [](char c) { return c < 32 || c > 126; }, '.');
+  auto f = [](char c) { return c < 32 || c > 126; };
+  std::replace_if(result.begin(), result.end(), f, '.');
   return result;
 }
 

src/convert.cpp

@@ -1051,7 +1051,7 @@ void Converter::cnvXmpFlash(const char* from, const char* to) {
       value |= fired & 1;
 #ifndef SUPPRESS_WARNINGS
     else
-      EXV_WARNING << "Failed to convert " << std::string(from) + "/exif:Fired"
+      EXV_WARNING << "Failed to convert " << std::string(from) << "/exif:Fired"
                   << " to " << to << "\n";
 #endif
   }
@@ -1062,7 +1062,7 @@ void Converter::cnvXmpFlash(const char* from, const char* to) {
       value |= (ret & 3) << 1;
 #ifndef SUPPRESS_WARNINGS
     else
-      EXV_WARNING << "Failed to convert " << std::string(from) + "/exif:Return"
+      EXV_WARNING << "Failed to convert " << std::string(from) << "/exif:Return"
                   << " to " << to << "\n";
 #endif
   }
@@ -1073,7 +1073,7 @@ void Converter::cnvXmpFlash(const char* from, const char* to) {
       value |= (mode & 3) << 3;
 #ifndef SUPPRESS_WARNINGS
     else
-      EXV_WARNING << "Failed to convert " << std::string(from) + "/exif:Mode"
+      EXV_WARNING << "Failed to convert " << std::string(from) << "/exif:Mode"
                   << " to " << to << "\n";
 #endif
   }
@@ -1084,7 +1084,7 @@ void Converter::cnvXmpFlash(const char* from, const char* to) {
       value |= (function & 1) << 5;
 #ifndef SUPPRESS_WARNINGS
     else
-      EXV_WARNING << "Failed to convert " << std::string(from) + "/exif:Function"
+      EXV_WARNING << "Failed to convert " << std::string(from) << "/exif:Function"
                   << " to " << to << "\n";
 #endif
   }
@@ -1096,7 +1096,7 @@ void Converter::cnvXmpFlash(const char* from, const char* to) {
         value |= (red & 1) << 6;
 #ifndef SUPPRESS_WARNINGS
       else
-        EXV_WARNING << "Failed to convert " << std::string(from) + "/exif:RedEyeMode"
+        EXV_WARNING << "Failed to convert " << std::string(from) << "/exif:RedEyeMode"
                     << " to " << to << "\n";
 #endif
     }

src/fff.h

@@ -282,7 +282,7 @@ struct OBJECT_PAR_T {
 
   float relHum;      //!< relative humidity
   long reserved[4];  //!< For future use - should be set to 0
-};                   //!< sizeof struct == 48 bytes
+};
 
 struct TEMP_CALIB_T {
   long Reserved1[2];
@@ -344,7 +344,7 @@ struct TEMPSENSOR_DATA_T {
   char pzTSName[SYSIMG_NAMELEN + 1];
   ULONG captureTime;       //!< TS updated; time in seconds since 1970-01-01 00:00
   ULONG captureMilliTime;  //!< TS updated; Milliseconds since last second
-};                         //!< sizeof struct == 28 bytes
+};
 
 /** Detector parameter struct */
 struct DETECTOR_PARAM_T {
@@ -360,7 +360,7 @@ struct EXTENDED_IMAGEINFO_T {
   DETECTOR_PARAM_T detectorPars[20];  //!< Currently used detector parameters like
                                       //!     used bias, offsets. Usage is camera
                                       //!     dependent
-};                                    //!< sizeof struct == 960 bytes
+};
 
 struct _bidata_t {
   GEOMETRIC_INFO_T GeometricInfo;  // 32 bytes