Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-13 13:40:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

VS 2017 (15.7 preview) /analyze cleanup

Browse Source
This commit is contained in:
Chuck Walbourn 2018-03-29 10:17:31 -07:00
parent 327586970d
commit 4724707546
10 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DirectXTex/BC6HBC7.cpp
View File

@ -451,8 +451,8 @@ namespace
public: public:
INTColor() = default; INTColor() = default;
INTColor(int nr, int ng, int nb) { r = nr; g = ng; b = nb; } INTColor(int nr, int ng, int nb) : pad(0) { r = nr; g = ng; b = nb; }
INTColor(const INTColor& c) { r = c.r; g = c.g; b = c.b; } INTColor(const INTColor& c) : pad(0) { r = c.r; g = c.g; b = c.b; }
INTColor operator - (_In_ const INTColor& c) const INTColor operator - (_In_ const INTColor& c) const
{ {

4
DirectXTex/BCDirectCompute.cpp
View File

@ -79,10 +79,12 @@ namespace
} }
}; };
GPUCompressBC::GPUCompressBC() : GPUCompressBC::GPUCompressBC() DIRECTX_NOEXCEPT :
m_bcformat(DXGI_FORMAT_UNKNOWN), m_bcformat(DXGI_FORMAT_UNKNOWN),
m_srcformat(DXGI_FORMAT_UNKNOWN), m_srcformat(DXGI_FORMAT_UNKNOWN),
m_alphaWeight(1.f), m_alphaWeight(1.f),
m_bc7_mode02(false),
m_bc7_mode137(false),
m_width(0), m_width(0),
m_height(0) m_height(0)
{ {

2
DirectXTex/BCDirectCompute.h
View File

@ -15,7 +15,7 @@ namespace DirectX
class GPUCompressBC class GPUCompressBC
{ {
public: public:
GPUCompressBC(); GPUCompressBC() DIRECTX_NOEXCEPT;
HRESULT Initialize(_In_ ID3D11Device* pDevice); HRESULT Initialize(_In_ ID3D11Device* pDevice);

19
DirectXTex/DirectXTex.h
View File

@ -35,6 +35,13 @@
struct IWICImagingFactory; struct IWICImagingFactory;
struct IWICMetadataQueryReader; struct IWICMetadataQueryReader;
#ifndef DIRECTX_NOEXCEPT
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
#endif
namespace DirectX namespace DirectX
{ {
@ -257,13 +264,13 @@ namespace DirectX
class ScratchImage class ScratchImage
{ {
public: public:
ScratchImage() ScratchImage() DIRECTX_NOEXCEPT
: m_nimages(0), m_size(0), m_metadata{}, m_image(nullptr), m_memory(nullptr) {} : m_nimages(0), m_size(0), m_metadata{}, m_image(nullptr), m_memory(nullptr) {}
ScratchImage(ScratchImage&& moveFrom) ScratchImage(ScratchImage&& moveFrom) DIRECTX_NOEXCEPT
: m_nimages(0), m_size(0), m_metadata{}, m_image(nullptr), m_memory(nullptr) { *this = std::move(moveFrom); } : m_nimages(0), m_size(0), m_metadata{}, m_image(nullptr), m_memory(nullptr) { *this = std::move(moveFrom); }
~ScratchImage() { Release(); } ~ScratchImage() { Release(); }
ScratchImage& __cdecl operator= (ScratchImage&& moveFrom); ScratchImage& __cdecl operator= (ScratchImage&& moveFrom) DIRECTX_NOEXCEPT;
ScratchImage(const ScratchImage&) = delete; ScratchImage(const ScratchImage&) = delete;
ScratchImage& operator=(const ScratchImage&) = delete; ScratchImage& operator=(const ScratchImage&) = delete;
@ -308,11 +315,11 @@ namespace DirectX
class Blob class Blob
{ {
public: public:
Blob() : m_buffer(nullptr), m_size(0) {} Blob() DIRECTX_NOEXCEPT : m_buffer(nullptr), m_size(0) {}
Blob(Blob&& moveFrom) : m_buffer(nullptr), m_size(0) { *this = std::move(moveFrom); } Blob(Blob&& moveFrom) DIRECTX_NOEXCEPT : m_buffer(nullptr), m_size(0) { *this = std::move(moveFrom); }
~Blob() { Release(); } ~Blob() { Release(); }
Blob& __cdecl operator= (Blob&& moveFrom); Blob& __cdecl operator= (Blob&& moveFrom) DIRECTX_NOEXCEPT;
Blob(const Blob&) = delete; Blob(const Blob&) = delete;
Blob& operator=(const Blob&) = delete; Blob& operator=(const Blob&) = delete;

2
DirectXTex/DirectXTexConvert.cpp
View File

@ -4429,7 +4429,7 @@ namespace
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
hr = FC->Initialize(source.Get(), targetGUID, _GetWICDither(filter), nullptr, threshold * 100.f, WICBitmapPaletteTypeMedianCut); hr = FC->Initialize(source.Get(), targetGUID, _GetWICDither(filter), nullptr, threshold * 100.0, WICBitmapPaletteTypeMedianCut);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;

2
DirectXTex/DirectXTexImage.cpp
View File

@ -234,7 +234,7 @@ bool DirectX::_SetupImageArray(
// ScratchImage - Bitmap image container // ScratchImage - Bitmap image container
//===================================================================================== //=====================================================================================
ScratchImage& ScratchImage::operator= (ScratchImage&& moveFrom) ScratchImage& ScratchImage::operator= (ScratchImage&& moveFrom) DIRECTX_NOEXCEPT
{ {
if (this != &moveFrom) if (this != &moveFrom)
{ {

6
DirectXTex/DirectXTexP.h
View File

@ -116,12 +116,6 @@
#define XBOX_DXGI_FORMAT_R4G4_UNORM DXGI_FORMAT(190) #define XBOX_DXGI_FORMAT_R4G4_UNORM DXGI_FORMAT(190)
#if !defined(DIRECTX_NOEXCEPT) && defined(_MSC_VER) && (_MSC_VER < 1900)
#define DIRECTX_NOEXCEPT
#else
#define DIRECTX_NOEXCEPT noexcept
#endif
namespace DirectX namespace DirectX
{ {
//--------------------------------------------------------------------------------- //---------------------------------------------------------------------------------

2
DirectXTex/DirectXTexUtil.cpp
View File

@ -1413,7 +1413,7 @@ size_t TexMetadata::ComputeIndex(size_t mip, size_t item, size_t slice) const
// Blob - Bitmap image container // Blob - Bitmap image container
//===================================================================================== //=====================================================================================
Blob& Blob::operator= (Blob&& moveFrom) Blob& Blob::operator= (Blob&& moveFrom) DIRECTX_NOEXCEPT
{ {
if (this != &moveFrom) if (this != &moveFrom)
{ {

2
DirectXTex/Filters.h
View File

@ -237,7 +237,7 @@ namespace TriangleFilter
TriangleRow* next; TriangleRow* next;
ScopedAlignedArrayXMVECTOR scanline; ScopedAlignedArrayXMVECTOR scanline;
TriangleRow() : remaining(0), next(nullptr) {} TriangleRow() DIRECTX_NOEXCEPT : remaining(0), next(nullptr) {}
}; };
static const size_t TF_FILTER_SIZE = sizeof(Filter) - sizeof(FilterFrom); static const size_t TF_FILTER_SIZE = sizeof(Filter) - sizeof(FilterFrom);

10
Texdiag/texdiag.cpp
View File

@ -3384,7 +3384,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
} }
wprintf(L"Result: %f (%f %f %f %f) PSNR %f dB\n", mse, mseV[0], mseV[1], mseV[2], mseV[3], wprintf(L"Result: %f (%f %f %f %f) PSNR %f dB\n", mse, mseV[0], mseV[1], mseV[2], mseV[3],
10.f * log10f(3.f / (mseV[0] + mseV[1] + mseV[2]))); 10.0 * log10(3.0 / (double(mseV[0]) + double(mseV[1]) + double(mseV[2]))));
} }
else else
{ {
@ -3444,7 +3444,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
++total_images; ++total_images;
wprintf(L"[%3Iu,%3Iu]: %f (%f %f %f %f) PSNR %f dB\n", mip, slice, mse, mseV[0], mseV[1], mseV[2], mseV[3], wprintf(L"[%3Iu,%3Iu]: %f (%f %f %f %f) PSNR %f dB\n", mip, slice, mse, mseV[0], mseV[1], mseV[2], mseV[3],
10.f * log10f(3.f / (mseV[0] + mseV[1] + mseV[2]))); 10.0 * log10(3.0 / (double(mseV[0]) + double(mseV[1]) + double(mseV[2]))));
} }
} }
@ -3495,7 +3495,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
++total_images; ++total_images;
wprintf(L"[%3Iu,%3Iu]: %f (%f %f %f %f) PSNR %f dB\n", item, mip, mse, mseV[0], mseV[1], mseV[2], mseV[3], wprintf(L"[%3Iu,%3Iu]: %f (%f %f %f %f) PSNR %f dB\n", item, mip, mse, mseV[0], mseV[1], mseV[2], mseV[3],
10.f * log10f(3.f / (mseV[0] + mseV[1] + mseV[2]))); 10.0 * log10(3.0 / (double(mseV[0]) + double(mseV[1]) + double(mseV[2]))));
} }
} }
} }
@ -3505,7 +3505,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
if (total_images > 1) if (total_images > 1)
{ {
wprintf(L"\n Minimum MSE: %f (%f %f %f %f) PSNR %f dB\n", min_mse, min_mseV[0], min_mseV[1], min_mseV[2], min_mseV[3], wprintf(L"\n Minimum MSE: %f (%f %f %f %f) PSNR %f dB\n", min_mse, min_mseV[0], min_mseV[1], min_mseV[2], min_mseV[3],
10.f * log10f(3.f / (min_mseV[0] + min_mseV[1] + min_mseV[2]))); 10.0 * log10(3.0 / (double(min_mseV[0]) + double(min_mseV[1]) + double(min_mseV[2]))));
double total_mseV0 = sum_mseV[0] / double(total_images); double total_mseV0 = sum_mseV[0] / double(total_images);
double total_mseV1 = sum_mseV[1] / double(total_images); double total_mseV1 = sum_mseV[1] / double(total_images);
double total_mseV2 = max_mseV[2] / double(total_images); double total_mseV2 = max_mseV[2] / double(total_images);
@ -3516,7 +3516,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
sum_mseV[3] / double(total_images), sum_mseV[3] / double(total_images),
10.0 * log10(3.0 / (total_mseV0 + total_mseV1 + total_mseV2))); 10.0 * log10(3.0 / (total_mseV0 + total_mseV1 + total_mseV2)));
wprintf(L" Maximum MSE: %f (%f %f %f %f) PSNR %f dB\n", max_mse, max_mseV[0], max_mseV[1], max_mseV[2], max_mseV[3], wprintf(L" Maximum MSE: %f (%f %f %f %f) PSNR %f dB\n", max_mse, max_mseV[0], max_mseV[1], max_mseV[2], max_mseV[3],
10.f * log10f(3.f / (max_mseV[0] + max_mseV[1] + max_mseV[2]))); 10.0 * log10(3.0 / (double(max_mseV[0]) + double(max_mseV[1]) + double(max_mseV[2]))));
} }
} }
} }