From 51b4eccaa8c2b9572eb62ccdeec31117c99d161b Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 24 Aug 2020 06:55:00 -0400
Subject: [PATCH] Default empty destructors in llimage
---
indra/llimage/llimagedxt.cpp | 4 ----
indra/llimage/llimagedxt.h | 2 +-
indra/llimage/llimagej2c.cpp | 7 -------
indra/llimage/llimagej2c.h | 4 ++--
indra/llimage/llimagepng.cpp | 4 ----
indra/llimage/llimagepng.h | 2 +-
indra/llimage/llimageworker.cpp | 4 ----
indra/llimage/llimageworker.h | 2 +-
indra/llimagej2coj/llimagej2coj.cpp | 4 ----
indra/llimagej2coj/llimagej2coj.h | 2 +-
10 files changed, 6 insertions(+), 29 deletions(-)
diff --git a/indra/llimage/llimagedxt.cpp b/indra/llimage/llimagedxt.cpp
index 36317a5ba88..f88caca5da3 100644
--- a/indra/llimage/llimagedxt.cpp
+++ b/indra/llimage/llimagedxt.cpp
@@ -167,10 +167,6 @@ LLImageDXT::LLImageDXT()
{
}
-LLImageDXT::~LLImageDXT()
-{
-}
-
// virtual
bool LLImageDXT::updateData()
{
diff --git a/indra/llimage/llimagedxt.h b/indra/llimage/llimagedxt.h
index 6e7126c0cf5..29d5f212d48 100644
--- a/indra/llimage/llimagedxt.h
+++ b/indra/llimage/llimagedxt.h
@@ -90,7 +90,7 @@ class LLImageDXT final : public LLImageFormatted
};
protected:
- /*virtual*/ ~LLImageDXT();
+ /*virtual*/ ~LLImageDXT() = default;
private:
bool encodeDXT(const LLImageRaw* raw_image, F32 decode_time, bool explicit_mips);
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp
index 71cab0554d7..2d70c11284e 100644
--- a/indra/llimage/llimagej2c.cpp
+++ b/indra/llimage/llimagej2c.cpp
@@ -80,9 +80,6 @@ LLImageJ2C::LLImageJ2C() : LLImageFormatted(IMG_CODEC_J2C),
}
}
-// virtual
-LLImageJ2C::~LLImageJ2C() {}
-
// virtual
void LLImageJ2C::resetLastError()
{
@@ -442,10 +439,6 @@ void LLImageJ2C::updateRawDiscardLevel()
mRawDiscardLevel = mMaxBytes ? calcDiscardLevelBytes(mMaxBytes) : mDiscardLevel;
}
-LLImageJ2CImpl::~LLImageJ2CImpl()
-{
-}
-
//----------------------------------------------------------------------------------------------
// Start of LLImageCompressionTester
//----------------------------------------------------------------------------------------------
diff --git a/indra/llimage/llimagej2c.h b/indra/llimage/llimagej2c.h
index 1e1c91a306c..db86f5308d6 100644
--- a/indra/llimage/llimagej2c.h
+++ b/indra/llimage/llimagej2c.h
@@ -41,7 +41,7 @@ class LLImageCompressionTester ;
class LLImageJ2C final : public LLImageFormatted
{
protected:
- virtual ~LLImageJ2C();
+ virtual ~LLImageJ2C() = default;
public:
LLImageJ2C();
@@ -106,7 +106,7 @@ class LLImageJ2C final : public LLImageFormatted
class LLImageJ2CImpl
{
public:
- virtual ~LLImageJ2CImpl();
+ virtual ~LLImageJ2CImpl() = default;
protected:
// Find out the image size and number of channels.
// Return value:
diff --git a/indra/llimage/llimagepng.cpp b/indra/llimage/llimagepng.cpp
index c4b98d82603..5fddd7987eb 100644
--- a/indra/llimage/llimagepng.cpp
+++ b/indra/llimage/llimagepng.cpp
@@ -40,10 +40,6 @@ LLImagePNG::LLImagePNG()
{
}
-LLImagePNG::~LLImagePNG()
-{
-}
-
// Virtual
// Parse PNG image information and set the appropriate
// width, height and component (channel) information.
diff --git a/indra/llimage/llimagepng.h b/indra/llimage/llimagepng.h
index 109510ef9b4..8b6cede0a4f 100644
--- a/indra/llimage/llimagepng.h
+++ b/indra/llimage/llimagepng.h
@@ -32,7 +32,7 @@
class LLImagePNG final : public LLImageFormatted
{
protected:
- ~LLImagePNG();
+ ~LLImagePNG() = default;
public:
LLImagePNG();
diff --git a/indra/llimage/llimageworker.cpp b/indra/llimage/llimageworker.cpp
index 10688f0f68c..c70dbdefba1 100644
--- a/indra/llimage/llimageworker.cpp
+++ b/indra/llimage/llimageworker.cpp
@@ -92,10 +92,6 @@ S32 LLImageDecodeThread::tut_size()
return res;
}
-LLImageDecodeThread::Responder::~Responder()
-{
-}
-
//----------------------------------------------------------------------------
LLImageDecodeThread::ImageRequest::ImageRequest(handle_t handle, LLImageFormatted* image,
diff --git a/indra/llimage/llimageworker.h b/indra/llimage/llimageworker.h
index c6adfab3278..019331bc0a7 100644
--- a/indra/llimage/llimageworker.h
+++ b/indra/llimage/llimageworker.h
@@ -37,7 +37,7 @@ class LLImageDecodeThread : public LLQueuedThread
class Responder : public LLThreadSafeRefCount
{
protected:
- virtual ~Responder();
+ virtual ~Responder() = default;
public:
virtual void completed(bool success, LLImageRaw* raw, LLImageRaw* aux) = 0;
};
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index d1a2f9c8f78..13c49a9675a 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -100,10 +100,6 @@ LLImageJ2COJ::LLImageJ2COJ()
}
-LLImageJ2COJ::~LLImageJ2COJ()
-{
-}
-
bool LLImageJ2COJ::initDecode(LLImageJ2C &base, LLImageRaw &raw_image, int discard_level, int* region)
{
// No specific implementation for this method in the OpenJpeg case
diff --git a/indra/llimagej2coj/llimagej2coj.h b/indra/llimagej2coj/llimagej2coj.h
index 02b9a11ea1a..6c0abc12f37 100644
--- a/indra/llimagej2coj/llimagej2coj.h
+++ b/indra/llimagej2coj/llimagej2coj.h
@@ -33,7 +33,7 @@ class LLImageJ2COJ final : public LLImageJ2CImpl
{
public:
LLImageJ2COJ();
- virtual ~LLImageJ2COJ();
+ virtual ~LLImageJ2COJ() = default;
protected:
virtual bool getMetadata(LLImageJ2C &base);
virtual bool decodeImpl(LLImageJ2C &base, LLImageRaw &raw_image, F32 decode_time, S32 first_channel, S32 max_channel_count);
--
GitLab