Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2021-04-08 16:51:27 +0300
committerJacques Lucke <jacques@blender.org>2021-04-08 16:51:39 +0300
commitf0317911850f07c75aa2e10e371b69b135194ac6 (patch)
treeb1323db6a11fc6e2729104d8f9af7118743b04df /source/blender/imbuf
parent89b3c9da48cf685361105df1ca2e9ed27ef240ae (diff)
Cleanup: modernize-use-equals-default
This was missing from rB19dfb6ea1f6745c0dbc2ce21839c30184b553878.
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/intern/dds/ColorBlock.cpp5
-rw-r--r--source/blender/imbuf/intern/dds/ColorBlock.h2
-rw-r--r--source/blender/imbuf/intern/dds/DirectDrawSurface.cpp4
-rw-r--r--source/blender/imbuf/intern/dds/DirectDrawSurface.h1
4 files changed, 1 insertions, 11 deletions
diff --git a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp
index 3b1b970fb3c..a05c7e2a70d 100644
--- a/source/blender/imbuf/intern/dds/ColorBlock.cpp
+++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp
@@ -46,11 +46,6 @@ inline static uint colorDistance(Color32 c0, Color32 c1)
}
#endif
-/** Default constructor. */
-ColorBlock::ColorBlock()
-{
-}
-
/** Init the color block from an array of colors. */
ColorBlock::ColorBlock(const uint *linearImage)
{
diff --git a/source/blender/imbuf/intern/dds/ColorBlock.h b/source/blender/imbuf/intern/dds/ColorBlock.h
index 9c3d73bbb0d..158695cfbf3 100644
--- a/source/blender/imbuf/intern/dds/ColorBlock.h
+++ b/source/blender/imbuf/intern/dds/ColorBlock.h
@@ -34,7 +34,7 @@
/** Uncompressed 4x4 color block. */
struct ColorBlock {
- ColorBlock();
+ ColorBlock() = default;
ColorBlock(const uint *linearImage);
ColorBlock(const ColorBlock &block);
ColorBlock(const Image *img, uint x, uint y);
diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
index 2a36946df8f..b665996b18f 100644
--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
@@ -890,10 +890,6 @@ DirectDrawSurface::DirectDrawSurface(unsigned char *mem, uint size) : stream(mem
}
}
-DirectDrawSurface::~DirectDrawSurface()
-{
-}
-
bool DirectDrawSurface::isValid() const
{
if (header.fourcc != FOURCC_DDS || header.size != 124) {
diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.h b/source/blender/imbuf/intern/dds/DirectDrawSurface.h
index b6c2d1962e2..b63d705dadf 100644
--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.h
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.h
@@ -136,7 +136,6 @@ struct DDSHeader {
class DirectDrawSurface {
public:
DirectDrawSurface(unsigned char *mem, uint size);
- ~DirectDrawSurface();
bool isValid() const;
bool isSupported() const;