From 3290fe61460cc6339f1900eae4e2928984dcdbc0 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Wed, 1 Feb 2023 18:03:45 -0800
Subject: [PATCH] remove deleted Image member functions

The inherited Image class already has these same deleted functions.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 include/exiv2/asfvideo.hpp       |  8 --------
 include/exiv2/bmpimage.hpp       |  9 ---------
 include/exiv2/cr2image.hpp       | 10 ----------
 include/exiv2/crwimage.hpp       | 10 ----------
 include/exiv2/epsimage.hpp       | 10 ----------
 include/exiv2/gifimage.hpp       |  9 ---------
 include/exiv2/jp2image.hpp       |  8 --------
 include/exiv2/jpgimage.hpp       | 23 -----------------------
 include/exiv2/matroskavideo.hpp  |  8 --------
 include/exiv2/mrwimage.hpp       |  9 ---------
 include/exiv2/orfimage.hpp       |  9 ---------
 include/exiv2/pgfimage.hpp       |  8 --------
 include/exiv2/pngimage.hpp       |  8 --------
 include/exiv2/psdimage.hpp       |  9 ---------
 include/exiv2/quicktimevideo.hpp |  8 --------
 include/exiv2/rafimage.hpp       | 10 ----------
 include/exiv2/riffvideo.hpp      |  8 --------
 include/exiv2/rw2image.hpp       | 10 ----------
 include/exiv2/tgaimage.hpp       |  9 ---------
 include/exiv2/tiffimage.hpp      |  9 ---------
 include/exiv2/webpimage.hpp      |  7 -------
 include/exiv2/xmpsidecar.hpp     | 10 ----------
 22 files changed, 209 deletions(-)

diff --git a/include/exiv2/asfvideo.hpp b/include/exiv2/asfvideo.hpp
index 09fd489a..592eff50 100644
--- a/include/exiv2/asfvideo.hpp
+++ b/include/exiv2/asfvideo.hpp
@@ -61,14 +61,6 @@ class EXIV2API AsfVideo : public Image {
   explicit AsfVideo(BasicIo::UniquePtr io);
   //@}
 
-  //! @name NOT Implemented
-  //@{
-  //! Copy constructor
-  AsfVideo(const AsfVideo&) = delete;
-  //! Assignment operator
-  AsfVideo& operator=(const AsfVideo&) = delete;
-  //@}
-
   //! @name Manipulators
   //@{
   void readMetadata() override;
diff --git a/include/exiv2/bmpimage.hpp b/include/exiv2/bmpimage.hpp
index 616ca0f2..bb7da64a 100644
--- a/include/exiv2/bmpimage.hpp
+++ b/include/exiv2/bmpimage.hpp
@@ -26,15 +26,6 @@ namespace Exiv2 {
  */
 class EXIV2API BmpImage : public Image {
  public:
-  ~BmpImage() override = default;
-  //! @name NOT Implemented
-  //@{
-  //! Copy constructor
-  BmpImage(const BmpImage&) = delete;
-  //! Assignment operator
-  BmpImage& operator=(const BmpImage&) = delete;
-  //@}
-
   //! @name Creators
   //@{
   /*!
diff --git a/include/exiv2/cr2image.hpp b/include/exiv2/cr2image.hpp
index 04712a32..b7533b13 100644
--- a/include/exiv2/cr2image.hpp
+++ b/include/exiv2/cr2image.hpp
@@ -70,16 +70,6 @@ class EXIV2API Cr2Image : public Image {
   [[nodiscard]] uint32_t pixelWidth() const override;
   [[nodiscard]] uint32_t pixelHeight() const override;
   //@}
-
-  ~Cr2Image() override = default;
-  //! @name NOT implemented
-  //@{
-  //! Copy constructor
-  Cr2Image(const Cr2Image&) = delete;
-  //! Assignment operator
-  Cr2Image& operator=(const Cr2Image&) = delete;
-  //@}
-
 };  // class Cr2Image
 
 /*!
diff --git a/include/exiv2/crwimage.hpp b/include/exiv2/crwimage.hpp
index 5a44b828..33901171 100644
--- a/include/exiv2/crwimage.hpp
+++ b/include/exiv2/crwimage.hpp
@@ -72,16 +72,6 @@ class EXIV2API CrwImage : public Image {
   [[nodiscard]] uint32_t pixelWidth() const override;
   [[nodiscard]] uint32_t pixelHeight() const override;
   //@}
-
-  ~CrwImage() override = default;
-  //! @name NOT Implemented
-  //@{
-  //! Copy constructor
-  CrwImage(const CrwImage&) = delete;
-  //! Assignment operator
-  CrwImage& operator=(const CrwImage&) = delete;
-  //@}
-
 };  // class CrwImage
 
 /*!
diff --git a/include/exiv2/epsimage.hpp b/include/exiv2/epsimage.hpp
index 52135a88..0cf1a533 100644
--- a/include/exiv2/epsimage.hpp
+++ b/include/exiv2/epsimage.hpp
@@ -72,16 +72,6 @@ class EXIV2API EpsImage : public Image {
   //@{
   [[nodiscard]] std::string mimeType() const override;
   //@}
-
-  ~EpsImage() override = default;
-  //! @name NOT Implemented
-  //@{
-  //! Copy constructor
-  EpsImage(const EpsImage&) = delete;
-  //! Assignment operator
-  EpsImage& operator=(const EpsImage&) = delete;
-  //@}
-
 };  // class EpsImage
 
 // *****************************************************************************
diff --git a/include/exiv2/gifimage.hpp b/include/exiv2/gifimage.hpp
index b518219e..42479277 100644
--- a/include/exiv2/gifimage.hpp
+++ b/include/exiv2/gifimage.hpp
@@ -21,15 +21,6 @@ namespace Exiv2 {
  */
 class EXIV2API GifImage : public Image {
  public:
-  ~GifImage() override = default;
-  //! @name NOT Implemented
-  //@{
-  //! Copy constructor
-  GifImage(const GifImage&) = delete;
-  //! Assignment operator
-  GifImage& operator=(const GifImage&) = delete;
-  //@}
-
   //! @name Creators
   //@{
   /*!
diff --git a/include/exiv2/jp2image.hpp b/include/exiv2/jp2image.hpp
index 972a82fe..b46fe41d 100644
--- a/include/exiv2/jp2image.hpp
+++ b/include/exiv2/jp2image.hpp
@@ -64,14 +64,6 @@ class EXIV2API Jp2Image : public Image {
   [[nodiscard]] std::string mimeType() const override;
   //@}
 
-  ~Jp2Image() override = default;
-  //! @name NOT Implemented
-  //@{
-  //! Copy constructor
-  Jp2Image(const Jp2Image&) = delete;
-  //! Assignment operator
-  Jp2Image& operator=(const Jp2Image&) = delete;
-
  private:
   /*!
     @brief Provides the main implementation of writeMetadata() by
diff --git a/include/exiv2/jpgimage.hpp b/include/exiv2/jpgimage.hpp
index 929a4bb0..6c2c8953 100644
--- a/include/exiv2/jpgimage.hpp
+++ b/include/exiv2/jpgimage.hpp
@@ -27,15 +27,6 @@ class EXIV2API JpegBase : public Image {
   void printStructure(std::ostream& out, PrintStructureOption option, size_t depth) override;
   //@}
 
-  ~JpegBase() override = default;
-  //! @name NOT implemented
-  //@{
-  //! Copy constructor
-  JpegBase(const JpegBase&) = delete;
-  //! Assignment operator
-  JpegBase& operator=(const JpegBase&) = delete;
-  //@}
-
  protected:
   //! @name Creators
   //@{
@@ -164,13 +155,6 @@ class EXIV2API JpegImage : public JpegBase {
   [[nodiscard]] std::string mimeType() const override;
   //@}
 
-  ~JpegImage() override = default;
-  // NOT Implemented
-  //! Copy constructor
-  JpegImage(const JpegImage&) = delete;
-  //! Assignment operator
-  JpegImage& operator=(const JpegImage&) = delete;
-
  protected:
   //! @name Accessors
   //@{
@@ -223,13 +207,6 @@ class EXIV2API ExvImage : public JpegBase {
   [[nodiscard]] std::string mimeType() const override;
   //@}
 
-  ~ExvImage() override = default;
-  // NOT Implemented
-  //! Copy constructor
-  ExvImage(const ExvImage&) = delete;
-  //! Assignment operator
-  ExvImage& operator=(const ExvImage&) = delete;
-
  protected:
   //! @name Accessors
   //@{
diff --git a/include/exiv2/matroskavideo.hpp b/include/exiv2/matroskavideo.hpp
index 112b807b..144a108b 100644
--- a/include/exiv2/matroskavideo.hpp
+++ b/include/exiv2/matroskavideo.hpp
@@ -118,14 +118,6 @@ class EXIV2API MatroskaVideo : public Image {
   explicit MatroskaVideo(BasicIo::UniquePtr io);
   //@}
 
-  //! @name NOT Implemented
-  //@{
-  //! Copy constructor
-  MatroskaVideo(const MatroskaVideo&) = delete;
-  //! Assignment operator
-  MatroskaVideo& operator=(const MatroskaVideo&) = delete;
-  //@}
-
   //! @name Manipulators
   //@{
   void readMetadata() override;
diff --git a/include/exiv2/mrwimage.hpp b/include/exiv2/mrwimage.hpp
index 68dd5e91..cf748585 100644
--- a/include/exiv2/mrwimage.hpp
+++ b/include/exiv2/mrwimage.hpp
@@ -21,15 +21,6 @@ namespace Exiv2 {
  */
 class EXIV2API MrwImage : public Image {
  public:
-  ~MrwImage() override = default;
-  //! @name NOT Implemented
-  //@{
-  //! Copy constructor
-  MrwImage(const MrwImage&) = delete;
-  //! Assignment operator
-  MrwImage& operator=(const MrwImage&) = delete;
-  //@}
-
   //! @name Creators
   //@{
   /*!
diff --git a/include/exiv2/orfimage.hpp b/include/exiv2/orfimage.hpp
index a884d0b8..86804ea9 100644
--- a/include/exiv2/orfimage.hpp
+++ b/include/exiv2/orfimage.hpp
@@ -21,15 +21,6 @@ namespace Exiv2 {
  */
 class EXIV2API OrfImage : public TiffImage {
  public:
-  ~OrfImage() override = default;
-  //! @name NOT Implemented
-  //@{
-  //! Copy constructor
-  OrfImage(const OrfImage&) = delete;
-  //! Assignment operator
-  OrfImage& operator=(const OrfImage&) = delete;
-  //@}
-
   //! @name Creators
   //@{
   /*!
diff --git a/include/exiv2/pgfimage.hpp b/include/exiv2/pgfimage.hpp
index f5428204..7855d484 100644
--- a/include/exiv2/pgfimage.hpp
+++ b/include/exiv2/pgfimage.hpp
@@ -54,14 +54,6 @@ class EXIV2API PgfImage : public Image {
   }
   //@}
 
-  ~PgfImage() override = default;
-  //! @name NOT implemented
-  //@{
-  //! Copy constructor
-  PgfImage(const PgfImage&) = delete;
-  //! Assignment operator
-  PgfImage& operator=(const PgfImage&) = delete;
-
  private:
   bool bSwap_;  // true for bigEndian hardware, else false
   /*!
diff --git a/include/exiv2/pngimage.hpp b/include/exiv2/pngimage.hpp
index 3c1a2609..16fd2384 100644
--- a/include/exiv2/pngimage.hpp
+++ b/include/exiv2/pngimage.hpp
@@ -60,14 +60,6 @@ class EXIV2API PngImage : public Image {
   [[nodiscard]] std::string mimeType() const override;
   //@}
 
-  ~PngImage() override = default;
-  //! @name NOT implemented
-  //@{
-  //! Copy constructor
-  PngImage(const PngImage&) = delete;
-  //! Assignment operator
-  PngImage& operator=(const PngImage&) = delete;
-
  private:
   /*!
     @brief Provides the main implementation of writeMetadata() by
diff --git a/include/exiv2/psdimage.hpp b/include/exiv2/psdimage.hpp
index 19ac37aa..c3a5d5f8 100644
--- a/include/exiv2/psdimage.hpp
+++ b/include/exiv2/psdimage.hpp
@@ -20,15 +20,6 @@ namespace Exiv2 {
  */
 class EXIV2API PsdImage : public Image {
  public:
-  ~PsdImage() override = default;
-  //! @name NOT Implemented
-  //@{
-  //! Copy constructor
-  PsdImage(const PsdImage&) = delete;
-  //! Assignment operator
-  PsdImage& operator=(const PsdImage&) = delete;
-  //@}
-
   //! @name Creators
   //@{
   /*!
diff --git a/include/exiv2/quicktimevideo.hpp b/include/exiv2/quicktimevideo.hpp
index b8a9661e..23dce9a1 100644
--- a/include/exiv2/quicktimevideo.hpp
+++ b/include/exiv2/quicktimevideo.hpp
@@ -55,14 +55,6 @@ class EXIV2API QuickTimeVideo : public Image {
   explicit QuickTimeVideo(BasicIo::UniquePtr io);
   //@}
 
-  //! @name NOT Implemented
-  //@{
-  //! Copy constructor
-  QuickTimeVideo(const QuickTimeVideo&) = delete;
-  //! Assignment operator
-  QuickTimeVideo& operator=(const QuickTimeVideo&) = delete;
-  //@}
-
   //! @name Manipulators
   //@{
   void readMetadata() override;
diff --git a/include/exiv2/rafimage.hpp b/include/exiv2/rafimage.hpp
index 48c5db0d..89ab57be 100644
--- a/include/exiv2/rafimage.hpp
+++ b/include/exiv2/rafimage.hpp
@@ -73,16 +73,6 @@ class EXIV2API RafImage : public Image {
   [[nodiscard]] uint32_t pixelWidth() const override;
   [[nodiscard]] uint32_t pixelHeight() const override;
   //@}
-
-  ~RafImage() override = default;
-  //! @name NOT implemented
-  //@{
-  //! Copy constructor
-  RafImage(const RafImage&) = delete;
-  //! Assignment operator
-  RafImage& operator=(const RafImage&) = delete;
-  //@}
-
 };  // class RafImage
 
 // *****************************************************************************
diff --git a/include/exiv2/riffvideo.hpp b/include/exiv2/riffvideo.hpp
index 9e1f4634..5d73e780 100644
--- a/include/exiv2/riffvideo.hpp
+++ b/include/exiv2/riffvideo.hpp
@@ -55,14 +55,6 @@ class EXIV2API RiffVideo : public Image {
   explicit RiffVideo(BasicIo::UniquePtr io);
   //@}
 
-  //! @name NOT Implemented
-  //@{
-  //! Copy constructor
-  RiffVideo(const RiffVideo&) = delete;
-  //! Assignment operator
-  RiffVideo& operator=(const RiffVideo&) = delete;
-  //@}
-
   //! @name Manipulators
   //@{
   void printStructure(std::ostream& out, PrintStructureOption option, size_t depth) override;
diff --git a/include/exiv2/rw2image.hpp b/include/exiv2/rw2image.hpp
index a3c52dbe..56738f3a 100644
--- a/include/exiv2/rw2image.hpp
+++ b/include/exiv2/rw2image.hpp
@@ -71,16 +71,6 @@ class EXIV2API Rw2Image : public Image {
   [[nodiscard]] uint32_t pixelWidth() const override;
   [[nodiscard]] uint32_t pixelHeight() const override;
   //@}
-
-  ~Rw2Image() override = default;
-  //! @name NOT implemented
-  //@{
-  //! Copy constructor
-  Rw2Image(const Rw2Image&) = delete;
-  //! Assignment operator
-  Rw2Image& operator=(const Rw2Image&) = delete;
-  //@}
-
 };  // class Rw2Image
 
 /*!
diff --git a/include/exiv2/tgaimage.hpp b/include/exiv2/tgaimage.hpp
index 7615280d..8c8d26de 100644
--- a/include/exiv2/tgaimage.hpp
+++ b/include/exiv2/tgaimage.hpp
@@ -20,15 +20,6 @@ namespace Exiv2 {
  */
 class EXIV2API TgaImage : public Image {
  public:
-  ~TgaImage() override = default;
-  //! @name NOT Implemented
-  //@{
-  //! Copy constructor
-  TgaImage(const TgaImage&) = delete;
-  //! Assignment operator
-  TgaImage& operator=(const TgaImage&) = delete;
-  //@}
-
   //! @name Creators
   //@{
   /*!
diff --git a/include/exiv2/tiffimage.hpp b/include/exiv2/tiffimage.hpp
index 48c29172..e77eb6c7 100644
--- a/include/exiv2/tiffimage.hpp
+++ b/include/exiv2/tiffimage.hpp
@@ -68,15 +68,6 @@ class EXIV2API TiffImage : public Image {
   uint32_t pixelHeight() const override;
   //@}
 
-  ~TiffImage() override = default;
-  //! @name NOT Implemented
-  //@{
-  //! Copy constructor
-  TiffImage(const TiffImage&) = delete;
-  //! Assignment operator
-  TiffImage& operator=(const TiffImage&) = delete;
-  //@}
-
  private:
   //! @name Accessors
   //@{
diff --git a/include/exiv2/webpimage.hpp b/include/exiv2/webpimage.hpp
index 90bf6349..295922f3 100644
--- a/include/exiv2/webpimage.hpp
+++ b/include/exiv2/webpimage.hpp
@@ -54,13 +54,6 @@ class EXIV2API WebPImage : public Image {
   [[nodiscard]] std::string mimeType() const override;
   //@}
 
-  ~WebPImage() override = default;
-  //! Copy constructor
-  WebPImage(const WebPImage&) = delete;
-  //! Assignment operator
-  WebPImage& operator=(const WebPImage&) = delete;
-  //@}
-
  private:
   void doWriteMetadata(BasicIo& outIo);
 
diff --git a/include/exiv2/xmpsidecar.hpp b/include/exiv2/xmpsidecar.hpp
index 399b1abd..fe0b0eb5 100644
--- a/include/exiv2/xmpsidecar.hpp
+++ b/include/exiv2/xmpsidecar.hpp
@@ -54,17 +54,7 @@ class EXIV2API XmpSidecar : public Image {
   [[nodiscard]] std::string mimeType() const override;
   //@}
 
-  //! @name NOT Implemented
-  //@{
-  ~XmpSidecar() override = default;
-  //! Copy constructor
-  XmpSidecar(const XmpSidecar&) = delete;
-  //! Assignment operator
-  XmpSidecar& operator=(const XmpSidecar&) = delete;
-  //@}
-
   Exiv2::Dictionary dates_;
-
 };  // class XmpSidecar
 
 // *****************************************************************************