summaryrefslogtreecommitdiffstats
path: root/TextureLoader/src/Image.cpp
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2019-05-04 23:27:17 +0000
committerEgor Yusov <egor.yusov@gmail.com>2019-05-04 23:27:17 +0000
commitd9aa9669f8886ebe64c9d93e0ce29006ce8e0c28 (patch)
treeca14730c14316227cf239f00a0da19d081e2b22d /TextureLoader/src/Image.cpp
parentGLTF loader: setting default normal to (0,0,0) so that the shdare can compute... (diff)
downloadDiligentTools-d9aa9669f8886ebe64c9d93e0ce29006ce8e0c28.tar.gz
DiligentTools-d9aa9669f8886ebe64c9d93e0ce29006ce8e0c28.zip
Fixed a couple of Mac build problems
Diffstat (limited to 'TextureLoader/src/Image.cpp')
-rw-r--r--TextureLoader/src/Image.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/TextureLoader/src/Image.cpp b/TextureLoader/src/Image.cpp
index 89956da..be05fe0 100644
--- a/TextureLoader/src/Image.cpp
+++ b/TextureLoader/src/Image.cpp
@@ -670,10 +670,10 @@ EImageFileFormat Image::GetFileFormat(const Uint8* pData, size_t Size)
return EImageFileFormat::png;
if (Size >= 4 &&
- (pData[0] == 0x49 && pData[1] == 0x20 && pData[2] == 0x49 ||
- pData[0] == 0x49 && pData[1] == 0x49 && pData[2] == 0x2A && pData[3] == 0x00 ||
- pData[0] == 0x4D && pData[1] == 0x4D && pData[2] == 0x00 && pData[3] == 0x2A ||
- pData[0] == 0x4D && pData[1] == 0x4D && pData[2] == 0x00 && pData[3] == 0x2B))
+ ((pData[0] == 0x49 && pData[1] == 0x20 && pData[2] == 0x49) ||
+ (pData[0] == 0x49 && pData[1] == 0x49 && pData[2] == 0x2A && pData[3] == 0x00) ||
+ (pData[0] == 0x4D && pData[1] == 0x4D && pData[2] == 0x00 && pData[3] == 0x2A) ||
+ (pData[0] == 0x4D && pData[1] == 0x4D && pData[2] == 0x00 && pData[3] == 0x2B)))
return EImageFileFormat::tiff;
if (Size >= 4 && pData[0] == 0x44 && pData[1] == 0x44 && pData[2] == 0x53 && pData[3] == 0x20)