Mirrors/bimg
1
0
Fork 0
mirror of https://github.com/bkaradzic/bimg.git synced 2026-02-17 20:52:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Бранимир Караџић
2020-02-08 15:41:35 -08:00
parent 54519648cf
commit 29a722a729
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/image.cpp
View File

@@ -1287,8 +1287,13 @@ namespace bimg
bx::read(&reader, magic);
ImageContainer imageContainer;
if (magicT != magic
|| !parseFnT(imageContainer, &reader, _err) )
if (magicT != magic)
{
BX_ERROR_SET(_err, BIMG_ERROR, "Invalid header magic.");
return NULL;
}
if (!parseFnT(imageContainer, &reader, _err) )
{
return NULL;
}
@@ -3516,6 +3521,7 @@ namespace bimg
if (!_err->isOk()
|| headerSize < DDS_HEADER_SIZE)
{
BX_ERROR_SET(_err, BIMG_ERROR, "DDS: Invalid header size.");
return false;
}
@@ -3946,6 +3952,7 @@ namespace bimg
if (identifier[1] != '1'
&& identifier[2] != '1')
{
BX_ERROR_SET(_err, BIMG_ERROR, "KTX: Unrecognized version.");
return false;
}
@@ -4036,7 +4043,7 @@ namespace bimg
if (TextureFormat::Unknown == format)
{
BX_ERROR_SET(_err, BIMG_ERROR, "Unrecognized image format.");
BX_ERROR_SET(_err, BIMG_ERROR, "KTX: Unrecognized image format.");
return false;
}