From 187f6d64a8ac33895b9bc5565119b49a45615b26 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 28 Dec 2023 23:30:46 -0800 Subject: [PATCH] Code review to silence some portability warnings (#422) --- DirectXTex/BC.h | 6 ++++++ DirectXTex/BC6HBC7.cpp | 13 ++++++++++++- DirectXTex/BCDirectCompute.h | 6 ++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/DirectXTex/BC.h b/DirectXTex/BC.h index cef5404..db650ba 100644 --- a/DirectXTex/BC.h +++ b/DirectXTex/BC.h @@ -61,6 +61,12 @@ namespace DirectX HDRColorA() = default; HDRColorA(float _r, float _g, float _b, float _a) noexcept : r(_r), g(_g), b(_b), a(_a) {} + HDRColorA(HDRColorA const&) = default; + HDRColorA& operator= (const HDRColorA&) = default; + + HDRColorA(HDRColorA&&) = default; + HDRColorA& operator= (HDRColorA&&) = default; + // binary operators HDRColorA operator + (const HDRColorA& c) const noexcept { diff --git a/DirectXTex/BC6HBC7.cpp b/DirectXTex/BC6HBC7.cpp index 8690131..0bd78e5 100644 --- a/DirectXTex/BC6HBC7.cpp +++ b/DirectXTex/BC6HBC7.cpp @@ -339,6 +339,12 @@ namespace DirectX LDRColorA() = default; LDRColorA(uint8_t _r, uint8_t _g, uint8_t _b, uint8_t _a) noexcept : r(_r), g(_g), b(_b), a(_a) {} + LDRColorA(LDRColorA const&) = default; + LDRColorA& operator= (const LDRColorA&) = default; + + LDRColorA(LDRColorA&&) = default; + LDRColorA& operator= (LDRColorA&&) = default; + const uint8_t& operator [] (_In_range_(0, 3) size_t uElement) const noexcept { switch (uElement) @@ -449,10 +455,15 @@ namespace int r, g, b; int pad; - public: INTColor() = default; INTColor(int nr, int ng, int nb) noexcept : r(nr), g(ng), b(nb), pad(0) {} + INTColor(INTColor const&) = default; + INTColor& operator= (const INTColor&) = default; + + INTColor(INTColor&&) = default; + INTColor& operator= (INTColor&&) = default; + INTColor& operator += (_In_ const INTColor& c) noexcept { r += c.r; diff --git a/DirectXTex/BCDirectCompute.h b/DirectXTex/BCDirectCompute.h index 23f013c..ae025b5 100644 --- a/DirectXTex/BCDirectCompute.h +++ b/DirectXTex/BCDirectCompute.h @@ -17,6 +17,12 @@ namespace DirectX public: GPUCompressBC() noexcept; + GPUCompressBC(GPUCompressBC&&) = default; + GPUCompressBC& operator= (GPUCompressBC&&) = default; + + GPUCompressBC(GPUCompressBC const&) = delete; + GPUCompressBC& operator= (GPUCompressBC const&) = delete; + HRESULT Initialize(_In_ ID3D11Device* pDevice); HRESULT Prepare(size_t width, size_t height, uint32_t flags, DXGI_FORMAT format, float alphaWeight);