Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2025-07-13 05:30:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor code review

Browse Source
This commit is contained in:
Chuck Walbourn 2018-07-31 12:24:34 -07:00
parent 2c82697c1b
commit 9b61fa93bd
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DirectXTex/DirectXTexHDR.cpp
View File

@ -334,7 +334,7 @@ namespace
_Success_(return > 0) _Success_(return > 0)
size_t EncodeRLE(_Out_writes_(width * 4) uint8_t* enc, _In_reads_(width * 4) const uint8_t* rgbe, size_t rowPitch, size_t width) size_t EncodeRLE(_Out_writes_(width * 4) uint8_t* enc, _In_reads_(width * 4) const uint8_t* rgbe, size_t rowPitch, size_t width)
{ {
if (width < 8 || width > 32767) if (width < 8 || width > INT16_MAX)
{ {
// Don't try to compress too narrow or too wide scan-lines // Don't try to compress too narrow or too wide scan-lines
return 0; return 0;
@ -348,7 +348,7 @@ namespace
{ {
size_t spanLen = 1; size_t spanLen = 1;
auto spanPtr = reinterpret_cast<const uint32_t*>(scanPtr); auto spanPtr = reinterpret_cast<const uint32_t*>(scanPtr);
while (pixelCount + spanLen < width && spanLen < 32767) while (pixelCount + spanLen < width && spanLen < INT16_MAX)
{ {
if (spanPtr[spanLen] == *spanPtr) if (spanPtr[spanLen] == *spanPtr)
{ {
@ -871,7 +871,7 @@ HRESULT DirectX::SaveToHDRMemory(const Image& image, Blob& blob)
if (!image.pixels) if (!image.pixels)
return E_POINTER; return E_POINTER;
if (image.width > 32767 || image.height > 32767) if (image.width > INT16_MAX || image.height > INT16_MAX)
{ {
// Images larger than this can't be RLE encoded. They are technically allowed as // Images larger than this can't be RLE encoded. They are technically allowed as
// uncompresssed, but we just don't support them. // uncompresssed, but we just don't support them.
@ -976,7 +976,7 @@ HRESULT DirectX::SaveToHDRFile(const Image& image, const wchar_t* szFile)
if (!image.pixels) if (!image.pixels)
return E_POINTER; return E_POINTER;
if (image.width > 32767 || image.height > 32767) if (image.width > INT16_MAX || image.height > INT16_MAX)
{ {
// Images larger than this can't be RLE encoded. They are technically allowed as // Images larger than this can't be RLE encoded. They are technically allowed as
// uncompresssed, but we just don't support them. // uncompresssed, but we just don't support them.

4
DirectXTex/DirectXTexTGA.cpp
View File

@ -748,8 +748,8 @@ namespace
{ {
memset(&header, 0, sizeof(TGA_HEADER)); memset(&header, 0, sizeof(TGA_HEADER));
if ((image.width > 0xFFFF) if ((image.width > UINT16_MAX)
|| (image.height > 0xFFFF)) || (image.height > UINT16_MAX))
{ {
return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED); return HRESULT_FROM_WIN32(ERROR_NOT_SUPPORTED);
} }