diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-04-08 01:14:11 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-04-08 01:14:11 +0000 |
| commit | 0b7d07f841d8ed1f6da94a8f4a2900c2eff6355d (patch) | |
| tree | 9102a5baca9316e363aa78fc7581d54dcfa9b821 /AssetLoader/src/GLTFLoader.cpp | |
| parent | Moved ImGuiScopedDisabler to ImGui namespace and renamed to ScopedDisabler (diff) | |
| download | DiligentTools-0b7d07f841d8ed1f6da94a8f4a2900c2eff6355d.tar.gz DiligentTools-0b7d07f841d8ed1f6da94a8f4a2900c2eff6355d.zip | |
Reworked PNG and JPEG image decoding to fix incompatibility of setjmp with c++ destructors. Added JPEG and PNG encoding/decoding tests
Diffstat (limited to 'AssetLoader/src/GLTFLoader.cpp')
| -rw-r--r-- | AssetLoader/src/GLTFLoader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/AssetLoader/src/GLTFLoader.cpp b/AssetLoader/src/GLTFLoader.cpp index df3cead..15c4034 100644 --- a/AssetLoader/src/GLTFLoader.cpp +++ b/AssetLoader/src/GLTFLoader.cpp @@ -33,7 +33,7 @@ #include "MapHelper.hpp" #include "CommonlyUsedStates.h" #include "DataBlobImpl.hpp" -#include "Image.hpp" +#include "Image.h" #include "FileSystem.hpp" #include "FileWrapper.hpp" #include "GraphicsAccessories.hpp" @@ -969,7 +969,7 @@ bool LoadImageData(tinygltf::Image* gltf_image, ImageLoadInfo LoadInfo; LoadInfo.Format = Image::GetFileFormat(image_data, size); - if (LoadInfo.Format == EImageFileFormat::unknown) + if (LoadInfo.Format == IMAGE_FILE_FORMAT_UNKNOWN) { if (error != nullptr) { |