diff --git a/DirectXTex/BC6HBC7.cpp b/DirectXTex/BC6HBC7.cpp index f76cbf4..15550c6 100644 --- a/DirectXTex/BC6HBC7.cpp +++ b/DirectXTex/BC6HBC7.cpp @@ -1431,7 +1431,7 @@ void D3DX_BC6H::GeneratePaletteQuantized(const EncodeParams* pEP, const INTEndPn assert(false); for(size_t i = 0; i < uNumIndices; ++i) { - #pragma prefast(suppress:22103, "writing blocks in two halves confuses tool") + #pragma prefast(suppress:22102 22103, "writing blocks in two halves confuses tool") aPalette[i] = INTColor(0,0,0); } return; @@ -1827,7 +1827,7 @@ void D3DX_BC6H::GeneratePaletteUnquantized(const EncodeParams* pEP, size_t uRegi assert(false); for(size_t i = 0; i < uNumIndices; ++i) { - #pragma prefast(suppress:22103, "writing blocks in two halves confuses tool") + #pragma prefast(suppress:22102 22103, "writing blocks in two halves confuses tool") aPalette[i] = INTColor(0,0,0); } return; diff --git a/DirectXTex/DirectXTexConvert.cpp b/DirectXTex/DirectXTexConvert.cpp index 1f7f721..825e62f 100644 --- a/DirectXTex/DirectXTexConvert.cpp +++ b/DirectXTex/DirectXTexConvert.cpp @@ -721,8 +721,8 @@ bool _ExpandScanline( LPVOID pDestination, size_t outSize, DXGI_FORMAT outFormat }\ return false; -_Use_decl_annotations_ -bool _LoadScanline( XMVECTOR* pDestination, size_t count, +#pragma warning(suppress: 6101) +_Use_decl_annotations_ bool _LoadScanline( XMVECTOR* pDestination, size_t count, LPCVOID pSource, size_t size, DXGI_FORMAT format ) { assert( pDestination && count > 0 && (((uintptr_t)pDestination & 0xF) == 0) ); diff --git a/DirectXTex/DirectXTexWIC.cpp b/DirectXTex/DirectXTexWIC.cpp index 9089255..6f30e33 100644 --- a/DirectXTex/DirectXTexWIC.cpp +++ b/DirectXTex/DirectXTexWIC.cpp @@ -58,6 +58,7 @@ using Microsoft::WRL::ComPtr; #else + #pragma prefast(suppress:28196, "a simple wrapper around an existing annotated function" ); static inline HRESULT CreateMemoryStream( _Outptr_ IStream** stream ) { return CreateStreamOnHGlobal( 0, TRUE, stream );