From 9766c4532daeff99eb285ff16a79be3ae75c862a Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 7 Jul 2022 18:55:14 -0700 Subject: [PATCH] fix some gcc -Weffc++ warnings Mostly deleted member functions Signed-off-by: Rosen Penev --- src/crwimage_int.hpp | 2 ++ src/preview.cpp | 3 +++ src/tiffcomposite_int.hpp | 2 ++ src/tiffvisitor_int.hpp | 14 ++++++++++++-- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/crwimage_int.hpp b/src/crwimage_int.hpp index 3a5751d0..635a2f54 100644 --- a/src/crwimage_int.hpp +++ b/src/crwimage_int.hpp @@ -60,6 +60,8 @@ class CiffComponent { //! Constructor taking a tag and directory CiffComponent(uint16_t tag, uint16_t dir) : dir_(dir), tag_(tag) { } + CiffComponent(const CiffComponent&) = delete; + CiffComponent& operator=(const CiffComponent&) = delete; //! Virtual destructor. virtual ~CiffComponent() = default; //@} diff --git a/src/preview.cpp b/src/preview.cpp index ec4a88b2..731a8186 100644 --- a/src/preview.cpp +++ b/src/preview.cpp @@ -207,6 +207,9 @@ class LoaderTiff : public Loader { //! Constructor LoaderTiff(PreviewId id, const Image& image, int parIdx); + LoaderTiff(const LoaderTiff&) = delete; + LoaderTiff& operator=(const LoaderTiff&) = delete; + //! Get properties of a preview image with given params [[nodiscard]] PreviewProperties getProperties() const override; diff --git a/src/tiffcomposite_int.hpp b/src/tiffcomposite_int.hpp index 0f8a04a2..26cc60ca 100644 --- a/src/tiffcomposite_int.hpp +++ b/src/tiffcomposite_int.hpp @@ -162,6 +162,8 @@ class TiffComponent { TiffComponent(uint16_t tag, IfdId group); //! Virtual destructor. virtual ~TiffComponent() = default; + TiffComponent(const TiffComponent&) = default; + TiffComponent& operator=(const TiffComponent&) = default; //@} //! @name Manipulators diff --git a/src/tiffvisitor_int.hpp b/src/tiffvisitor_int.hpp index 328bf5b0..4b722e76 100644 --- a/src/tiffvisitor_int.hpp +++ b/src/tiffvisitor_int.hpp @@ -48,8 +48,8 @@ class TiffVisitor { }; private: - static const int events_ = 2; //!< The number of stop/go flags. - std::array go_; //!< Array of stop/go flags. See setGo(). + static const int events_ = 2; //!< The number of stop/go flags. + std::array go_{}; //!< Array of stop/go flags. See setGo(). public: //! @name Creators @@ -134,6 +134,8 @@ class TiffFinder : public TiffVisitor { //! Constructor, taking \em tag and \em group of the component to find. TiffFinder(uint16_t tag, IfdId group) : tag_(tag), group_(group) { } + TiffFinder(const TiffFinder&) = delete; + TiffFinder& operator=(const TiffFinder&) = delete; //! Virtual destructor ~TiffFinder() override = default; //@} @@ -202,6 +204,8 @@ class TiffCopier : public TiffVisitor { @param pPrimaryGroups Pointer to the list of primary groups. */ TiffCopier(TiffComponent* pRoot, uint32_t root, const TiffHeaderBase* pHeader, const PrimaryGroups* pPrimaryGroups); + TiffCopier(const TiffCopier&) = delete; + TiffCopier& operator=(const TiffCopier&) = delete; //! Virtual destructor ~TiffCopier() override = default; //@} @@ -257,6 +261,8 @@ class TiffDecoder : public TiffVisitor { */ TiffDecoder(ExifData& exifData, IptcData& iptcData, XmpData& xmpData, TiffComponent* pRoot, FindDecoderFct findDecoderFct); + TiffDecoder(const TiffDecoder&) = delete; + TiffDecoder& operator=(const TiffDecoder&) = delete; //! Virtual destructor ~TiffDecoder() override = default; //@} @@ -348,6 +354,8 @@ class TiffEncoder : public TiffVisitor { TiffEncoder(ExifData exifData, const IptcData& iptcData, const XmpData& xmpData, TiffComponent* pRoot, bool isNewImage, const PrimaryGroups* pPrimaryGroups, const TiffHeaderBase* pHeader, FindEncoderFct findEncoderFct); + TiffEncoder(const TiffEncoder&) = delete; + TiffEncoder& operator=(const TiffEncoder&) = delete; //! Virtual destructor ~TiffEncoder() override = default; //@} @@ -585,6 +593,8 @@ class TiffReader : public TiffVisitor { base offset. */ TiffReader(const byte* pData, size_t size, TiffComponent* pRoot, TiffRwState state); + TiffReader(const TiffReader&) = delete; + TiffReader& operator=(const TiffReader&) = delete; //! Virtual destructor ~TiffReader() override = default;