AuroraMiddleware/DirectXTex
1
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex synced 2024-11-21 20:10:05 +00:00
Code Issues Releases Wiki Activity

Fix some /analyze warnings

Browse Source
This commit is contained in:
Chuck Walbourn 2019-10-24 16:55:13 -07:00
parent f235571cf6
commit 138efff1b9
6 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DDSView/ddsview.cpp
View File

@ -20,6 +20,8 @@
#include <directxmath.h> #include <directxmath.h>
#pragma warning(disable : 4619 4616 26812)
#include "DirectXTex.h" #include "DirectXTex.h"
using namespace DirectX; using namespace DirectX;

3
DirectXTex/BC6HBC7.cpp
View File

@ -3235,7 +3235,10 @@ void D3DX_BC7::EmitBlock(const EncodeParams* pEP, size_t uShape, size_t uRotatio
_Use_decl_annotations_ _Use_decl_annotations_
void D3DX_BC7::FixEndpointPBits(const EncodeParams* pEP, const LDREndPntPair *pOrigEndpoints, LDREndPntPair *pFixedEndpoints) void D3DX_BC7::FixEndpointPBits(const EncodeParams* pEP, const LDREndPntPair *pOrigEndpoints, LDREndPntPair *pFixedEndpoints)
{ {
assert(pEP);
const size_t uPartitions = ms_aInfo[pEP->uMode].uPartitions; const size_t uPartitions = ms_aInfo[pEP->uMode].uPartitions;
assert(uPartitions < BC7_MAX_REGIONS);
_Analysis_assume_(uPartitions < BC7_MAX_REGIONS);
pFixedEndpoints[0] = pOrigEndpoints[0]; pFixedEndpoints[0] = pOrigEndpoints[0];
pFixedEndpoints[1] = pOrigEndpoints[1]; pFixedEndpoints[1] = pOrigEndpoints[1];

3
DirectXTex/DirectXTexP.h
View File

@ -12,7 +12,7 @@
#pragma once #pragma once
// Off by default warnings // Off by default warnings
#pragma warning(disable : 4619 4616 4061 4265 4365 4571 4623 4625 4626 4628 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032 5039 5045) #pragma warning(disable : 4619 4616 4061 4265 4365 4571 4623 4625 4626 4628 4668 4710 4711 4746 4774 4820 4987 5026 5027 5031 5032 5039 5045 26812)
// C4619/4616 #pragma warning warnings // C4619/4616 #pragma warning warnings
// C4061 enumerator 'X' in switch of enum 'X' is not explicitly handled by a case label // C4061 enumerator 'X' in switch of enum 'X' is not explicitly handled by a case label
// C4265 class has virtual functions, but destructor is not virtual // C4265 class has virtual functions, but destructor is not virtual
@ -34,6 +34,7 @@
// C5031/5032 push/pop mismatches in windows headers // C5031/5032 push/pop mismatches in windows headers
// C5039 pointer or reference to potentially throwing function passed to extern C function under - EHc // C5039 pointer or reference to potentially throwing function passed to extern C function under - EHc
// C5045 Spectre mitigation warning // C5045 Spectre mitigation warning
// 26812: The enum type 'x' is unscoped. Prefer 'enum class' over 'enum' (Enum.3).
// Windows 8.1 SDK related Off by default warnings // Windows 8.1 SDK related Off by default warnings
#pragma warning(disable : 4471 4917 4986 5029) #pragma warning(disable : 4471 4917 4986 5029)

2
Texassemble/texassemble.cpp
View File

@ -36,6 +36,8 @@
#include <DirectXPackedVector.h> #include <DirectXPackedVector.h>
#include <wincodec.h> #include <wincodec.h>
#pragma warning(disable : 4619 4616 26812)
#include "DirectXTex.h" #include "DirectXTex.h"
//Uncomment to add support for OpenEXR (.exr) //Uncomment to add support for OpenEXR (.exr)

2
Texconv/texconv.cpp
View File

@ -35,6 +35,8 @@
#include <wincodec.h> #include <wincodec.h>
#pragma warning(disable : 4619 4616 26812)
#include "DirectXTex.h" #include "DirectXTex.h"
#include "DirectXPackedVector.h" #include "DirectXPackedVector.h"

2
Texdiag/texdiag.cpp
View File

@ -31,6 +31,8 @@
#include <dxgiformat.h> #include <dxgiformat.h>
#pragma warning(disable : 4619 4616 26812)
#include "DirectXTex.h" #include "DirectXTex.h"
//Uncomment to add support for OpenEXR (.exr) //Uncomment to add support for OpenEXR (.exr)