Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-08 13:56:13 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaned up /analyze warnings with VS 2015 Update 2

Browse Source
This commit is contained in:
Chuck Walbourn
2016-03-18 00:48:24 -07:00
parent a7ffe96b3e
commit 2b22bfed1c
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DirectXTex/DirectXTexConvert.cpp
View File

@@ -3010,7 +3010,7 @@ DWORD _GetConvertFlags( DXGI_FORMAT format )
ConvertData key = { format, 0 };
const ConvertData* in = (const ConvertData*) bsearch_s( &key, g_ConvertTable, _countof(g_ConvertTable), sizeof(ConvertData),
_ConvertCompare, 0 );
_ConvertCompare, nullptr );
return (in) ? in->flags : 0;
}
@@ -3038,10 +3038,10 @@ void _ConvertScanline( XMVECTOR* pBuffer, size_t count, DXGI_FORMAT outFormat, D
// Determine conversion details about source and dest formats
ConvertData key = { inFormat, 0 };
const ConvertData* in = (const ConvertData*) bsearch_s( &key, g_ConvertTable, _countof(g_ConvertTable), sizeof(ConvertData),
_ConvertCompare, 0 );
_ConvertCompare, nullptr );
key.format = outFormat;
const ConvertData* out = (const ConvertData*) bsearch_s( &key, g_ConvertTable, _countof(g_ConvertTable), sizeof(ConvertData),
_ConvertCompare, 0 );
_ConvertCompare, nullptr );
if ( !in || !out )
{
assert(false);

2
DirectXTex/DirectXTexWIC.cpp
View File

@@ -58,7 +58,7 @@ using Microsoft::WRL::ComPtr;
#else
#pragma prefast(suppress:28196, "a simple wrapper around an existing annotated function" );
#pragma prefast(suppress:6387 28196, "a simple wrapper around an existing annotated function" );
static inline HRESULT CreateMemoryStream( _Outptr_ IStream** stream )
{
return CreateStreamOnHGlobal( 0, TRUE, stream );