From 0b7d07f841d8ed1f6da94a8f4a2900c2eff6355d Mon Sep 17 00:00:00 2001
From: assiduous <assiduous@diligentgraphics.com>
Date: Tue, 7 Apr 2020 18:14:11 -0700
Subject: Reworked PNG and JPEG image decoding to fix incompatibility of setjmp
 with c++ destructors. Added JPEG and PNG encoding/decoding tests

---
 AssetLoader/src/GLTFLoader.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'AssetLoader/src/GLTFLoader.cpp')

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)
         {
-- 
cgit v1.2.3