VS 2017 (15.7 preview) /analyze cleanup

walbourn · walbourn · commit 47247075468a · 2018-03-29T10:17:31.000-07:00
diff --git a/DirectXTex/BC6HBC7.cpp b/DirectXTex/BC6HBC7.cpp
@@ -451,8 +451,8 @@ namespace
 
     public:
         INTColor() = default;
-        INTColor(int nr, int ng, int nb) { r = nr; g = ng; b = nb; }
-        INTColor(const INTColor& c) { r = c.r; g = c.g; b = c.b; }
+        INTColor(int nr, int ng, int nb) : pad(0) { r = nr; g = ng; b = nb; }
+        INTColor(const INTColor& c) : pad(0) { r = c.r; g = c.g; b = c.b; }
 
         INTColor operator - (_In_ const INTColor& c) const
         {
diff --git a/DirectXTex/BCDirectCompute.cpp b/DirectXTex/BCDirectCompute.cpp
@@ -79,10 +79,12 @@ namespace
     }
 };
 
-GPUCompressBC::GPUCompressBC() :
+GPUCompressBC::GPUCompressBC() DIRECTX_NOEXCEPT :
     m_bcformat(DXGI_FORMAT_UNKNOWN),
     m_srcformat(DXGI_FORMAT_UNKNOWN),
     m_alphaWeight(1.f),
+    m_bc7_mode02(false),
+    m_bc7_mode137(false),
     m_width(0),
     m_height(0)
 {
diff --git a/DirectXTex/BCDirectCompute.h b/DirectXTex/BCDirectCompute.h
@@ -15,7 +15,7 @@ namespace DirectX
     class GPUCompressBC
     {
     public:
-        GPUCompressBC();
+        GPUCompressBC() DIRECTX_NOEXCEPT;
 
         HRESULT Initialize(_In_ ID3D11Device* pDevice);
 
diff --git a/DirectXTex/DirectXTex.h b/DirectXTex/DirectXTex.h
@@ -35,6 +35,13 @@
 struct IWICImagingFactory;
 struct IWICMetadataQueryReader;
 
+#ifndef DIRECTX_NOEXCEPT
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
+#define DIRECTX_NOEXCEPT
+#else
+#define DIRECTX_NOEXCEPT noexcept
+#endif
+#endif
 
 namespace DirectX
 {
@@ -257,13 +264,13 @@ namespace DirectX
     class ScratchImage
     {
     public:
-        ScratchImage()
+        ScratchImage() DIRECTX_NOEXCEPT
             : 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); }
         ~ScratchImage() { Release(); }
 
-        ScratchImage& __cdecl operator= (ScratchImage&& moveFrom);
+        ScratchImage& __cdecl operator= (ScratchImage&& moveFrom) DIRECTX_NOEXCEPT;
 
         ScratchImage(const ScratchImage&) = delete;
         ScratchImage& operator=(const ScratchImage&) = delete;
@@ -308,11 +315,11 @@ namespace DirectX
     class Blob
     {
     public:
-        Blob() : m_buffer(nullptr), m_size(0) {}
-        Blob(Blob&& moveFrom) : m_buffer(nullptr), m_size(0) { *this = std::move(moveFrom); }
+        Blob() DIRECTX_NOEXCEPT : m_buffer(nullptr), m_size(0) {}
+        Blob(Blob&& moveFrom) DIRECTX_NOEXCEPT : m_buffer(nullptr), m_size(0) { *this = std::move(moveFrom); }
         ~Blob() { Release(); }
 
-        Blob& __cdecl operator= (Blob&& moveFrom);
+        Blob& __cdecl operator= (Blob&& moveFrom) DIRECTX_NOEXCEPT;
 
         Blob(const Blob&) = delete;
         Blob& operator=(const Blob&) = delete;
diff --git a/DirectXTex/DirectXTexConvert.cpp b/DirectXTex/DirectXTexConvert.cpp
@@ -4429,7 +4429,7 @@ namespace
         if (FAILED(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))
             return hr;
 
diff --git a/DirectXTex/DirectXTexImage.cpp b/DirectXTex/DirectXTexImage.cpp
@@ -234,7 +234,7 @@ bool DirectX::_SetupImageArray(
 // ScratchImage - Bitmap image container
 //=====================================================================================
 
-ScratchImage& ScratchImage::operator= (ScratchImage&& moveFrom)
+ScratchImage& ScratchImage::operator= (ScratchImage&& moveFrom) DIRECTX_NOEXCEPT
 {
     if (this != &moveFrom)
     {
diff --git a/DirectXTex/DirectXTexP.h b/DirectXTex/DirectXTexP.h
@@ -116,12 +116,6 @@
 
 #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
 {
     //---------------------------------------------------------------------------------
diff --git a/DirectXTex/DirectXTexUtil.cpp b/DirectXTex/DirectXTexUtil.cpp
@@ -1413,7 +1413,7 @@ size_t TexMetadata::ComputeIndex(size_t mip, size_t item, size_t slice) const
 // Blob - Bitmap image container
 //=====================================================================================
 
-Blob& Blob::operator= (Blob&& moveFrom)
+Blob& Blob::operator= (Blob&& moveFrom) DIRECTX_NOEXCEPT
 {
     if (this != &moveFrom)
     {
diff --git a/DirectXTex/Filters.h b/DirectXTex/Filters.h
@@ -237,7 +237,7 @@ namespace TriangleFilter
         TriangleRow*                next;
         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);
diff --git a/Texdiag/texdiag.cpp b/Texdiag/texdiag.cpp
@@ -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],
-                    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
             {
@@ -3444,7 +3444,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])
                                 ++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],
-                                    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;
 
                                 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)
                 {
                     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_mseV1 = sum_mseV[1] / 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),
                         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],
-                        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]))));
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -451,8 +451,8 @@ namespace`
`451`	`451`
`452`	`452`	`public:`
`453`	`453`	`INTColor() = default;`
`454`		`- INTColor(int nr, int ng, int nb) { r = nr; g = ng; b = nb; }`
`455`		`- INTColor(const INTColor& c) { r = c.r; g = c.g; b = c.b; }`
	`454`	`+ INTColor(int nr, int ng, int nb) : pad(0) { r = nr; g = ng; b = nb; }`
	`455`	`+ INTColor(const INTColor& c) : pad(0) { r = c.r; g = c.g; b = c.b; }`
`456`	`456`
`457`	`457`	`INTColor operator - (_In_ const INTColor& c) const`
`458`	`458`	`{`
Original file line number	Diff line number	Diff line change
`@@ -79,10 +79,12 @@ namespace`
`79`	`79`	`}`
`80`	`80`	`};`
`81`	`81`
`82`		`-GPUCompressBC::GPUCompressBC() :`
	`82`	`+GPUCompressBC::GPUCompressBC() DIRECTX_NOEXCEPT :`
`83`	`83`	`m_bcformat(DXGI_FORMAT_UNKNOWN),`
`84`	`84`	`m_srcformat(DXGI_FORMAT_UNKNOWN),`
`85`	`85`	`m_alphaWeight(1.f),`
	`86`	`+ m_bc7_mode02(false),`
	`87`	`+ m_bc7_mode137(false),`
`86`	`88`	`m_width(0),`
`87`	`89`	`m_height(0)`
`88`	`90`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace DirectX`
`15`	`15`	`class GPUCompressBC`
`16`	`16`	`{`
`17`	`17`	`public:`
`18`		`- GPUCompressBC();`
	`18`	`+ GPUCompressBC() DIRECTX_NOEXCEPT;`
`19`	`19`
`20`	`20`	`HRESULT Initialize(_In_ ID3D11Device* pDevice);`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,7 @@ bool DirectX::_SetupImageArray(`
`234`	`234`	`// ScratchImage - Bitmap image container`
`235`	`235`	`//=====================================================================================`
`236`	`236`
`237`		`-ScratchImage& ScratchImage::operator= (ScratchImage&& moveFrom)`
	`237`	`+ScratchImage& ScratchImage::operator= (ScratchImage&& moveFrom) DIRECTX_NOEXCEPT`
`238`	`238`	`{`
`239`	`239`	`if (this != &moveFrom)`
`240`	`240`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1413,7 +1413,7 @@ size_t TexMetadata::ComputeIndex(size_t mip, size_t item, size_t slice) const`
`1413`	`1413`	`// Blob - Bitmap image container`
`1414`	`1414`	`//=====================================================================================`
`1415`	`1415`
`1416`		`-Blob& Blob::operator= (Blob&& moveFrom)`
	`1416`	`+Blob& Blob::operator= (Blob&& moveFrom) DIRECTX_NOEXCEPT`
`1417`	`1417`	`{`
`1418`	`1418`	`if (this != &moveFrom)`
`1419`	`1419`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3384,7 +3384,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])`
`3384`	`3384`	`}`
`3385`	`3385`
`3386`	`3386`	`wprintf(L"Result: %f (%f %f %f %f) PSNR %f dB\n", mse, mseV[0], mseV[1], mseV[2], mseV[3],`
`3387`		`- 10.f * log10f(3.f / (mseV[0] + mseV[1] + mseV[2])));`
	`3387`	`+ 10.0 * log10(3.0 / (double(mseV[0]) + double(mseV[1]) + double(mseV[2]))));`
`3388`	`3388`	`}`
`3389`	`3389`	`else`
`3390`	`3390`	`{`
`@@ -3444,7 +3444,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])`
`3444`	`3444`	`++total_images;`
`3445`	`3445`
`3446`	`3446`	`wprintf(L"[%3Iu,%3Iu]: %f (%f %f %f %f) PSNR %f dB\n", mip, slice, mse, mseV[0], mseV[1], mseV[2], mseV[3],`
`3447`		`- 10.f * log10f(3.f / (mseV[0] + mseV[1] + mseV[2])));`
	`3447`	`+ 10.0 * log10(3.0 / (double(mseV[0]) + double(mseV[1]) + double(mseV[2]))));`
`3448`	`3448`	`}`
`3449`	`3449`	`}`
`3450`	`3450`
`@@ -3495,7 +3495,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])`
`3495`	`3495`	`++total_images;`
`3496`	`3496`
`3497`	`3497`	`wprintf(L"[%3Iu,%3Iu]: %f (%f %f %f %f) PSNR %f dB\n", item, mip, mse, mseV[0], mseV[1], mseV[2], mseV[3],`
`3498`		`- 10.f * log10f(3.f / (mseV[0] + mseV[1] + mseV[2])));`
	`3498`	`+ 10.0 * log10(3.0 / (double(mseV[0]) + double(mseV[1]) + double(mseV[2]))));`
`3499`	`3499`	`}`
`3500`	`3500`	`}`
`3501`	`3501`	`}`
`@@ -3505,7 +3505,7 @@ int __cdecl wmain(_In_ int argc, _In_z_count_(argc) wchar_t* argv[])`
`3505`	`3505`	`if (total_images > 1)`
`3506`	`3506`	`{`
`3507`	`3507`	`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],`
`3508`		`- 10.f * log10f(3.f / (min_mseV[0] + min_mseV[1] + min_mseV[2])));`
	`3508`	`+ 10.0 * log10(3.0 / (double(min_mseV[0]) + double(min_mseV[1]) + double(min_mseV[2]))));`
`3509`	`3509`	`double total_mseV0 = sum_mseV[0] / double(total_images);`
`3510`	`3510`	`double total_mseV1 = sum_mseV[1] / double(total_images);`
`3511`	`3511`	`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[])`
`3516`	`3516`	`sum_mseV[3] / double(total_images),`
`3517`	`3517`	`10.0 * log10(3.0 / (total_mseV0 + total_mseV1 + total_mseV2)));`
`3518`	`3518`	`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],`
`3519`		`- 10.f * log10f(3.f / (max_mseV[0] + max_mseV[1] + max_mseV[2])));`
	`3519`	`+ 10.0 * log10(3.0 / (double(max_mseV[0]) + double(max_mseV[1]) + double(max_mseV[2]))));`
`3520`	`3520`	`}`
`3521`	`3521`	`}`
`3522`	`3522`	`}`