From 3eed3ae91316e1e9de9ad5c80042d7aa58923b90 Mon Sep 17 00:00:00 2001 From: Chuck Walbourn Date: Thu, 12 May 2022 12:24:53 -0700 Subject: [PATCH] A few more uses of const --- DirectXTex/DirectXTexDDS.cpp | 2 +- DirectXTex/DirectXTexMipmaps.cpp | 4 ++-- DirectXTex/DirectXTexTGA.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DirectXTex/DirectXTexDDS.cpp b/DirectXTex/DirectXTexDDS.cpp index ca7fe7e..ebbe283 100644 --- a/DirectXTex/DirectXTexDDS.cpp +++ b/DirectXTex/DirectXTexDDS.cpp @@ -1944,7 +1944,7 @@ HRESULT DirectX::LoadFromDDSFile( } #ifdef _WIN32 - auto pixelBytes = static_cast(image.GetPixelsSize()); + auto const pixelBytes = static_cast(image.GetPixelsSize()); if (!ReadFile(hFile.get(), image.GetPixels(), pixelBytes, &bytesRead, nullptr)) { image.Release(); diff --git a/DirectXTex/DirectXTexMipmaps.cpp b/DirectXTex/DirectXTexMipmaps.cpp index 03c30c0..da9df6e 100644 --- a/DirectXTex/DirectXTexMipmaps.cpp +++ b/DirectXTex/DirectXTexMipmaps.cpp @@ -264,13 +264,13 @@ namespace XMVECTOR r1 = XMVectorSplatW(*pRow1); XMVECTOR v1 = XMVectorSaturate(XMVectorMultiply(r0, scale)); - XMVECTOR v2 = XMVectorSaturate(XMVectorMultiply(r1, scale)); + const XMVECTOR v2 = XMVectorSaturate(XMVectorMultiply(r1, scale)); r0 = XMVectorSplatW(*(++pRow0)); r1 = XMVectorSplatW(*(++pRow1)); XMVECTOR v3 = XMVectorSaturate(XMVectorMultiply(XMVectorSplatW(r0), scale)); - XMVECTOR v4 = XMVectorSaturate(XMVectorMultiply(XMVectorSplatW(r1), scale)); + const XMVECTOR v4 = XMVectorSaturate(XMVectorMultiply(XMVectorSplatW(r1), scale)); v1 = XMVectorMergeXY(v1, v2); // [v1.x v2.x --- ---] v3 = XMVectorMergeXY(v3, v4); // [v3.x v4.x --- ---] diff --git a/DirectXTex/DirectXTexTGA.cpp b/DirectXTex/DirectXTexTGA.cpp index 4f0b4a0..025ff90 100644 --- a/DirectXTex/DirectXTexTGA.cpp +++ b/DirectXTex/DirectXTexTGA.cpp @@ -328,7 +328,7 @@ namespace return HRESULT_E_NOT_SUPPORTED; } - size_t maxColorMap = size_t(pHeader->wColorMapFirst) + size_t(pHeader->wColorMapLength); + const size_t maxColorMap = size_t(pHeader->wColorMapFirst) + size_t(pHeader->wColorMapLength); if (maxColorMap > 256) { return HRESULT_E_NOT_SUPPORTED; @@ -920,7 +920,7 @@ namespace TGA_FLAGS flags, _In_ const Image* image, _In_ uint32_t convFlags, - _In_opt_ uint8_t* palette) noexcept + _In_opt_ const uint8_t* palette) noexcept { assert(pSource && size > 0);