diff --git a/DirectXTex/BC6HBC7.cpp b/DirectXTex/BC6HBC7.cpp index b9c011c..2fabbaa 100644 --- a/DirectXTex/BC6HBC7.cpp +++ b/DirectXTex/BC6HBC7.cpp @@ -1664,12 +1664,12 @@ void D3DX_BC6H::Decode(bool bSigned, HDRColorA* pOut) const if (ms_aModeToInfo[uMode] >= 0) { - assert(ms_aModeToInfo[uMode] < ARRAYSIZE(ms_aInfo)); - _Analysis_assume_(ms_aModeToInfo[uMode] < ARRAYSIZE(ms_aInfo)); + assert(static_cast(ms_aModeToInfo[uMode]) < _countof(ms_aInfo)); + _Analysis_assume_(ms_aModeToInfo[uMode] < _countof(ms_aInfo)); const ModeDescriptor* desc = ms_aDesc[ms_aModeToInfo[uMode]]; - assert(ms_aModeToInfo[uMode] < ARRAYSIZE(ms_aDesc)); - _Analysis_assume_(ms_aModeToInfo[uMode] < ARRAYSIZE(ms_aDesc)); + assert(static_cast(ms_aModeToInfo[uMode]) < _countof(ms_aDesc)); + _Analysis_assume_(ms_aModeToInfo[uMode] < _countof(ms_aDesc)); const ModeInfo& info = ms_aInfo[ms_aModeToInfo[uMode]]; INTEndPntPair aEndPts[BC6H_MAX_REGIONS] = {}; diff --git a/DirectXTex/DirectXTexP.h b/DirectXTex/DirectXTexP.h index 1b56570..5cb5bc9 100644 --- a/DirectXTex/DirectXTexP.h +++ b/DirectXTex/DirectXTexP.h @@ -42,6 +42,11 @@ // C4986 exception specification does not match previous declaration // C5029 nonstandard extension used +#ifdef __INTEL_COMPILER +#pragma warning(disable : 161) +// warning #161: unrecognized #pragma +#endif + #pragma warning(push) #pragma warning(disable : 4005) #define WIN32_LEAN_AND_MEAN