From 0b7d07f841d8ed1f6da94a8f4a2900c2eff6355d Mon Sep 17 00:00:00 2001 From: assiduous 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 --- TextureLoader/src/TextureUtilities.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'TextureLoader/src/TextureUtilities.cpp') diff --git a/TextureLoader/src/TextureUtilities.cpp b/TextureLoader/src/TextureUtilities.cpp index 858c6b3..ca131b9 100644 --- a/TextureLoader/src/TextureUtilities.cpp +++ b/TextureLoader/src/TextureUtilities.cpp @@ -29,7 +29,7 @@ #include "TextureUtilities.h" #include "Errors.hpp" #include "TextureLoader.h" -#include "Image.hpp" +#include "Image.h" #include "RefCntAutoPtr.hpp" #include "DataBlobImpl.hpp" @@ -50,9 +50,9 @@ void CreateTextureFromFile(const Char* FilePath, CreateTextureFromImage(pImage, TexLoadInfo, pDevice, ppTexture); else if (pRawData) { - if (ImgFmt == EImageFileFormat::dds) + if (ImgFmt == IMAGE_FILE_FORMAT_DDS) CreateTextureFromDDS(pRawData, TexLoadInfo, pDevice, ppTexture); - else if (ImgFmt == EImageFileFormat::ktx) + else if (ImgFmt == IMAGE_FILE_FORMAT_KTX) CreateTextureFromKTX(pRawData, TexLoadInfo, pDevice, ppTexture); else UNEXPECTED("Unexpected format"); -- cgit v1.2.3