diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-12-16 19:55:22 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-12-16 19:55:22 +0000 |
| commit | 900b137fbe73d2710d19605212b9c53afcdda11f (patch) | |
| tree | 5ed0c61d76d677dab49c5577fe71fc41a2966c48 /Projects/Asteroids/src/DDSTextureLoader.cpp | |
| parent | cmake is back online - removed notice (diff) | |
| download | DiligentEngine-900b137fbe73d2710d19605212b9c53afcdda11f.tar.gz DiligentEngine-900b137fbe73d2710d19605212b9c53afcdda11f.zip | |
Fixed few minor issues revealed by code analysis
Diffstat (limited to 'Projects/Asteroids/src/DDSTextureLoader.cpp')
| -rw-r--r-- | Projects/Asteroids/src/DDSTextureLoader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Projects/Asteroids/src/DDSTextureLoader.cpp b/Projects/Asteroids/src/DDSTextureLoader.cpp index 97e1064..84956e7 100644 --- a/Projects/Asteroids/src/DDSTextureLoader.cpp +++ b/Projects/Asteroids/src/DDSTextureLoader.cpp @@ -814,7 +814,7 @@ static HRESULT CreateTextureFromDDS( ID3D11Device* pDev, DDS_HEADER* pHeader, __ format = MAKE_SRGB( format ); // Create the texture - D3D11_SUBRESOURCE_DATA* pInitData = new D3D11_SUBRESOURCE_DATA[ iMipCount * arraySize ]; + D3D11_SUBRESOURCE_DATA* pInitData = new D3D11_SUBRESOURCE_DATA[ size_t{iMipCount} * size_t{arraySize} ]; if( !pInitData ) return E_OUTOFMEMORY; @@ -839,7 +839,7 @@ static HRESULT CreateTextureFromDDS( ID3D11Device* pDev, DDS_HEADER* pHeader, __ pInitData[index].SysMemSlicePitch = NumBytes; ++index; - if ( pSrcBits + (NumBytes*d) > pEndBits ) + if ( pSrcBits + (size_t{NumBytes}*d) > pEndBits ) { SAFE_DELETE_ARRAY( pInitData ); return HRESULT_FROM_WIN32( ERROR_HANDLE_EOF ); @@ -907,7 +907,7 @@ static HRESULT CreateTextureFromDDS( ID3D11Device* pDev, DDS_HEADER* pHeader, __ } } - pSrcBits += NumBytes * d; + pSrcBits += size_t{NumBytes} * d; w = w >> 1; h = h >> 1; |