diff options
-rw-r--r-- | src/XPM.cxx | 10 | ||||
-rw-r--r-- | src/XPM.h | 16 |
2 files changed, 0 insertions, 26 deletions
diff --git a/src/XPM.cxx b/src/XPM.cxx index eba3fb6c2..39a283b18 100644 --- a/src/XPM.cxx +++ b/src/XPM.cxx @@ -92,9 +92,6 @@ XPM::XPM(const char *const *linesForm) { Init(linesForm); } -XPM::~XPM() { -} - void XPM::Init(const char *textForm) { // Test done is two parts to avoid possibility of overstepping the memory // if memcmp implemented strangely. Must be 4 bytes at least at destination. @@ -241,9 +238,6 @@ RGBAImage::RGBAImage(const XPM &xpm) { } } -RGBAImage::~RGBAImage() { -} - int RGBAImage::CountBytes() const noexcept { return width * height * 4; } @@ -279,10 +273,6 @@ void RGBAImage::BGRAFromRGBA(unsigned char *pixelsBGRA, const unsigned char *pix RGBAImageSet::RGBAImageSet() : height(-1), width(-1) { } -RGBAImageSet::~RGBAImageSet() { - Clear(); -} - /// Remove all images. void RGBAImageSet::Clear() noexcept { images.clear(); @@ -25,11 +25,6 @@ class XPM { public: explicit XPM(const char *textForm); explicit XPM(const char *const *linesForm); - XPM(const XPM &) = default; - XPM(XPM &&) noexcept = default; - XPM &operator=(const XPM &) = default; - XPM &operator=(XPM &&) noexcept = default; - ~XPM(); void Init(const char *textForm); void Init(const char *const *linesForm); /// Decompose image into runs and use FillRectangle for each run @@ -53,11 +48,6 @@ public: static constexpr size_t bytesPerPixel = 4; RGBAImage(int width_, int height_, float scale_, const unsigned char *pixels_); explicit RGBAImage(const XPM &xpm); - RGBAImage(const RGBAImage &) = default; - RGBAImage(RGBAImage &&) noexcept = default; - RGBAImage &operator=(const RGBAImage &) = default; - RGBAImage &operator=(RGBAImage &&) noexcept = default; - virtual ~RGBAImage(); int GetHeight() const noexcept { return height; } int GetWidth() const noexcept { return width; } float GetScale() const noexcept { return scale; } @@ -79,12 +69,6 @@ class RGBAImageSet { mutable int width; ///< Memorize largest width of the set. public: RGBAImageSet(); - // Deleted so RGBAImageSet objects can not be copied. - RGBAImageSet(const RGBAImageSet &) = delete; - RGBAImageSet(RGBAImageSet &&) = delete; - RGBAImageSet &operator=(const RGBAImageSet &) = delete; - RGBAImageSet &operator=(RGBAImageSet &&) = delete; - ~RGBAImageSet(); /// Remove all images. void Clear() noexcept; /// Add an image. |