Support reading files with a DDS_PIXELFORMAT size of 24 (#393)
This commit is contained in:
Родитель
419e314914
Коммит
41eb26fb0c
|
@ -346,7 +346,9 @@ namespace
|
|||
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;
|
||||
}
|
||||
|
@ -359,6 +361,12 @@ namespace
|
|||
if ((pHeader->ddspf.flags & DDS_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
|
||||
if (size < (sizeof(DDS_HEADER) + sizeof(uint32_t) + sizeof(DDS_HEADER_DXT10)))
|
||||
{
|
||||
|
|
Загрузка…
Ссылка в новой задаче