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

Support reading files with a DDS_PIXELFORMAT size of 24 (#393)

Browse Source
This commit is contained in:
Nicholas Hayes 2023-09-11 11:10:16 -06:00 committed by GitHub
parent 419e314914
commit 41eb26fb0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
DirectXTex/DirectXTexDDS.cpp
View File

@ -346,7 +346,9 @@ namespace
return E_FAIL; return E_FAIL;
} }
if (pHeader->ddspf.size != 0 && pHeader->ddspf.size != sizeof(DDS_PIXELFORMAT)) if (pHeader->ddspf.size != 0 /* Known variant */
&& pHeader->ddspf.size != 24 /* Known variant */
&& pHeader->ddspf.size != sizeof(DDS_PIXELFORMAT))
{ {
return E_FAIL; return E_FAIL;
} }
@ -359,6 +361,12 @@ namespace
if ((pHeader->ddspf.flags & DDS_FOURCC) if ((pHeader->ddspf.flags & DDS_FOURCC)
&& (MAKEFOURCC('D', 'X', '1', '0') == pHeader->ddspf.fourCC)) && (MAKEFOURCC('D', 'X', '1', '0') == pHeader->ddspf.fourCC))
{ {
if (pHeader->ddspf.size != sizeof(DDS_PIXELFORMAT))
{
// We do not accept legacy DX9 'known variants' for modern "DX10" extension header files.
return E_FAIL;
}
// Buffer must be big enough for both headers and magic value // Buffer must be big enough for both headers and magic value
if (size < (sizeof(DDS_HEADER) + sizeof(uint32_t) + sizeof(DDS_HEADER_DXT10))) if (size < (sizeof(DDS_HEADER) + sizeof(uint32_t) + sizeof(DDS_HEADER_DXT10)))
{ {