Merge pull request #2252 from neheb/2

clang-tidy: use default member init

Author: kevinbackhouse

include/exiv2/basicio.hpp

@@ -735,7 +735,7 @@ class EXIV2API XPathIo : public FileIo {
 
  private:
   // True if the file is a temporary file and it should be deleted in destructor.
-  bool isTemp_;
+  bool isTemp_{true};
   std::string tempFilePath_;
 };  // class XPathIo
 #endif

include/exiv2/image.hpp

@@ -467,8 +467,8 @@ class EXIV2API Image {
   DataBuf iccProfile_;                //!< ICC buffer (binary data)
   std::string comment_;               //!< User comment
   std::string xmpPacket_;             //!< XMP packet
-  uint32_t pixelWidth_;               //!< image pixel width
-  uint32_t pixelHeight_;              //!< image pixel height
+  uint32_t pixelWidth_{0};            //!< image pixel width
+  uint32_t pixelHeight_{0};           //!< image pixel height
   NativePreviewList nativePreviews_;  //!< list of native previews
 
   //! Return tag name for given tag id.
@@ -479,13 +479,13 @@ class EXIV2API Image {
 
  private:
   // DATA
-  ImageType imageType_;         //!< Image type
-  uint16_t supportedMetadata_;  //!< Bitmap with all supported metadata types
-  bool writeXmpFromPacket_;     //!< Determines the source when writing XMP
-  ByteOrder byteOrder_;         //!< Byte order
+  ImageType imageType_;                    //!< Image type
+  uint16_t supportedMetadata_;             //!< Bitmap with all supported metadata types
+  bool writeXmpFromPacket_;                //!< Determines the source when writing XMP
+  ByteOrder byteOrder_{invalidByteOrder};  //!< Byte order
 
   std::map<int, std::string> tags_;  //!< Map of tags
-  bool init_;                        //!< Flag marking if map of tags needs to be initialized
+  bool init_{true};                  //!< Flag marking if map of tags needs to be initialized
 
 };  // class Image
 

include/exiv2/tiffimage.hpp

@@ -85,10 +85,10 @@ class EXIV2API TiffImage : public Image {
   //@}
 
   // DATA
-  mutable std::string primaryGroup_;     //!< The primary group
-  mutable std::string mimeType_;         //!< The MIME type
-  mutable uint32_t pixelWidthPrimary_;   //!< Width of the primary image in pixels
-  mutable uint32_t pixelHeightPrimary_;  //!< Height of the primary image in pixels
+  mutable std::string primaryGroup_;        //!< The primary group
+  mutable std::string mimeType_;            //!< The MIME type
+  mutable uint32_t pixelWidthPrimary_{0};   //!< Width of the primary image in pixels
+  mutable uint32_t pixelHeightPrimary_{0};  //!< Height of the primary image in pixels
 
 };  // class TiffImage
 

include/exiv2/value.hpp

@@ -229,7 +229,7 @@ class EXIV2API Value {
    */
   Value& operator=(const Value&) = default;
   // DATA
-  mutable bool ok_;  //!< Indicates the status of the previous to<Type> conversion
+  mutable bool ok_{true};  //!< Indicates the status of the previous to<Type> conversion
 
  private:
   //! Internal virtual copy constructor.
@@ -648,8 +648,8 @@ class EXIV2API XmpValue : public Value {
 
  private:
   // DATA
-  XmpArrayType xmpArrayType_;  //!< Type of XMP array
-  XmpStruct xmpStruct_;        //!< XMP structure indicator
+  XmpArrayType xmpArrayType_{xaNone};  //!< Type of XMP array
+  XmpStruct xmpStruct_{xsNone};        //!< XMP structure indicator
 
 };  // class XmpValue
 

src/basicio.cpp

@@ -901,7 +901,7 @@ void XPathIo::ReadDataUri(const std::string& path) {
 }
 
 #else
-XPathIo::XPathIo(const std::string& orgPath) : FileIo(XPathIo::writeDataToFile(orgPath)), isTemp_(true) {
+XPathIo::XPathIo(const std::string& orgPath) : FileIo(XPathIo::writeDataToFile(orgPath)) {
   tempFilePath_ = path();
 }
 
@@ -994,15 +994,15 @@ class RemoteIo::Impl {
   Impl& operator=(const Impl&) = delete;
 
   // DATA
-  std::string path_;     //!< (Standard) path
-  size_t blockSize_;     //!< Size of the block memory.
-  BlockMap* blocksMap_;  //!< An array contains all blocksMap
-  size_t size_;          //!< The file size
-  size_t idx_;           //!< Index into the memory area
-  bool isMalloced_;      //!< Was the blocksMap_ allocated?
-  bool eof_;             //!< EOF indicator
-  Protocol protocol_;    //!< the protocol of url
-  size_t totalRead_;     //!< bytes requested from host
+  std::string path_;              //!< (Standard) path
+  size_t blockSize_;              //!< Size of the block memory.
+  BlockMap* blocksMap_{nullptr};  //!< An array contains all blocksMap
+  size_t size_{0};                //!< The file size
+  size_t idx_{0};                 //!< Index into the memory area
+  bool isMalloced_{false};        //!< Was the blocksMap_ allocated?
+  bool eof_{false};               //!< EOF indicator
+  Protocol protocol_;             //!< the protocol of url
+  size_t totalRead_{0};           //!< bytes requested from host
 
   // METHODS
   /*!
@@ -1044,15 +1044,7 @@ class RemoteIo::Impl {
 };  // class RemoteIo::Impl
 
 RemoteIo::Impl::Impl(const std::string& url, size_t blockSize) :
-    path_(url),
-    blockSize_(blockSize),
-    blocksMap_(nullptr),
-    size_(0),
-    idx_(0),
-    isMalloced_(false),
-    eof_(false),
-    protocol_(fileProtocol(url)),
-    totalRead_(0) {
+    path_(url), blockSize_(blockSize), protocol_(fileProtocol(url)) {
 }
 
 size_t RemoteIo::Impl::populateBlocks(size_t lowBlock, size_t highBlock) {

src/image.cpp

@@ -116,17 +116,13 @@ std::string pathOfFileUrl(const std::string& url) {
 namespace Exiv2 {
 Image::Image(ImageType type, uint16_t supportedMetadata, BasicIo::UniquePtr io) :
     io_(std::move(io)),
-    pixelWidth_(0),
-    pixelHeight_(0),
     imageType_(type),
     supportedMetadata_(supportedMetadata),
 #ifdef EXV_HAVE_XMP_TOOLKIT
-    writeXmpFromPacket_(false),
+    writeXmpFromPacket_(false) {
 #else
-    writeXmpFromPacket_(true),
+    writeXmpFromPacket_(true) {
 #endif
-    byteOrder_(invalidByteOrder),
-    init_(true) {
 }
 
 void Image::printStructure(std::ostream&, PrintStructureOption, int /*depth*/) {

src/preview.cpp

@@ -101,16 +101,16 @@ class Loader {
   const Image& image_;
 
   //! Preview image width
-  size_t width_;
+  size_t width_{0};
 
   //! Preview image length
-  size_t height_;
+  size_t height_{0};
 
   //! Preview image size in bytes
-  size_t size_;
+  size_t size_{0};
 
   //! True if the source image contains a preview image of given type
-  bool valid_;
+  bool valid_{false};
 };
 
 //! Loader for native previews
@@ -163,7 +163,7 @@ class LoaderExifJpeg : public Loader {
   static const Param param_[];
 
   //! Offset value
-  size_t offset_;
+  size_t offset_{0};
 };
 
 //! Function to create new LoaderExifJpeg
@@ -335,8 +335,7 @@ Loader::UniquePtr Loader::create(PreviewId id, const Image& image) {
   return loader;
 }
 
-Loader::Loader(PreviewId id, const Image& image) :
-    id_(id), image_(image), width_(0), height_(0), size_(0), valid_(false) {
+Loader::Loader(PreviewId id, const Image& image) : id_(id), image_(image) {
 }
 
 PreviewProperties Loader::getProperties() const {
@@ -457,7 +456,7 @@ bool LoaderNative::readDimensions() {
   return true;
 }
 
-LoaderExifJpeg::LoaderExifJpeg(PreviewId id, const Image& image, int parIdx) : Loader(id, image), offset_(0) {
+LoaderExifJpeg::LoaderExifJpeg(PreviewId id, const Image& image, int parIdx) : Loader(id, image) {
   const ExifData& exifData = image_.exifData();
   auto pos = exifData.findKey(ExifKey(param_[parIdx].offsetKey_));
   if (pos != exifData.end() && pos->count() > 0) {

src/tiffcomposite_int.cpp

@@ -28,7 +28,7 @@ bool TiffMappingInfo::operator==(const TiffMappingInfo::Key& key) const {
 }
 
 IoWrapper::IoWrapper(BasicIo& io, const byte* pHeader, size_t size, OffsetWriter* pow) :
-    io_(io), pHeader_(pHeader), size_(size), wroteHeader_(false), pow_(pow) {
+    io_(io), pHeader_(pHeader), size_(size), pow_(pow) {
   if (!pHeader_ || size_ == 0)
     wroteHeader_ = true;
 }
@@ -73,7 +73,7 @@ TiffMnEntry::TiffMnEntry(uint16_t tag, IfdId group, IfdId mnGroup) :
 }
 
 TiffIfdMakernote::TiffIfdMakernote(uint16_t tag, IfdId group, IfdId mnGroup, MnHeader* pHeader, bool hasNext) :
-    TiffComponent(tag, group), pHeader_(pHeader), ifd_(tag, mnGroup, hasNext), imageByteOrder_(invalidByteOrder) {
+    TiffComponent(tag, group), pHeader_(pHeader), ifd_(tag, mnGroup, hasNext) {
 }
 
 TiffBinaryArray::TiffBinaryArray(uint16_t tag, IfdId group, const ArrayCfg* arrayCfg, const ArrayDef* arrayDef,
@@ -90,8 +90,7 @@ TiffBinaryArray::TiffBinaryArray(uint16_t tag, IfdId group, const ArraySet* arra
   // We'll figure out the correct cfg later
 }
 
-TiffBinaryElement::TiffBinaryElement(uint16_t tag, IfdId group) :
-    TiffEntryBase(tag, group), elByteOrder_(invalidByteOrder) {
+TiffBinaryElement::TiffBinaryElement(uint16_t tag, IfdId group) : TiffEntryBase(tag, group) {
   elDef_.idx_ = 0;
   elDef_.tiffType_ = ttUndefined;
   elDef_.count_ = 0;

src/tiffcomposite_int.hpp

@@ -134,12 +134,12 @@ class IoWrapper {
 
  private:
   // DATA
-  BasicIo& io_;          //! Reference for the IO instance.
-  const byte* pHeader_;  //! Pointer to the header data.
-  size_t size_;          //! Size of the header data.
-  bool wroteHeader_;     //! Indicates if the header has been written.
-  OffsetWriter* pow_;    //! Pointer to an offset-writer, if any, or 0
-};                       // class IoWrapper
+  BasicIo& io_;              //! Reference for the IO instance.
+  const byte* pHeader_;      //! Pointer to the header data.
+  size_t size_;              //! Size of the header data.
+  bool wroteHeader_{false};  //! Indicates if the header has been written.
+  OffsetWriter* pow_;        //! Pointer to an offset-writer, if any, or 0
+};                           // class IoWrapper
 
 /*!
   @brief Interface class for components of a TIFF directory hierarchy
@@ -1229,10 +1229,10 @@ class TiffIfdMakernote : public TiffComponent {
 
  private:
   // DATA
-  MnHeader* pHeader_;         //!< Makernote header
-  TiffDirectory ifd_;         //!< Makernote IFD
-  uint32_t mnOffset_{};       //!< Makernote offset
-  ByteOrder imageByteOrder_;  //!< Byte order for the image
+  MnHeader* pHeader_;                           //!< Makernote header
+  TiffDirectory ifd_;                           //!< Makernote IFD
+  uint32_t mnOffset_{};                         //!< Makernote offset
+  ByteOrder imageByteOrder_{invalidByteOrder};  //!< Byte order for the image
 
 };  // class TiffIfdMakernote
 
@@ -1496,8 +1496,8 @@ class TiffBinaryElement : public TiffEntryBase {
 
  private:
   // DATA
-  ArrayDef elDef_;         //!< The array element definition
-  ByteOrder elByteOrder_;  //!< Byte order to read/write the element
+  ArrayDef elDef_;                           //!< The array element definition
+  ByteOrder elByteOrder_{invalidByteOrder};  //!< Byte order to read/write the element
 
 };  // class TiffBinaryElement
 

src/tiffimage.cpp

@@ -39,7 +39,7 @@ namespace Exiv2 {
 using namespace Internal;
 
 TiffImage::TiffImage(BasicIo::UniquePtr io, bool /*create*/) :
-    Image(ImageType::tiff, mdExif | mdIptc | mdXmp, std::move(io)), pixelWidthPrimary_(0), pixelHeightPrimary_(0) {
+    Image(ImageType::tiff, mdExif | mdIptc | mdXmp, std::move(io)) {
 }  // TiffImage::TiffImage
 
 //! Structure for TIFF compression to MIME type mappings