noahbackus
9d30169a8d
Some checks failed
🔗 GHA / 📊 Static checks (push) Has been cancelled
🔗 GHA / 🤖 Android (push) Has been cancelled
🔗 GHA / 🍏 iOS (push) Has been cancelled
🔗 GHA / 🐧 Linux (push) Has been cancelled
🔗 GHA / 🍎 macOS (push) Has been cancelled
🔗 GHA / 🏁 Windows (push) Has been cancelled
🔗 GHA / 🌐 Web (push) Has been cancelled
24 lines
897 B
Diff
24 lines
897 B
Diff
diff --git a/thirdparty/basis_universal/encoder/basisu_enc.cpp b/thirdparty/basis_universal/encoder/basisu_enc.cpp
|
|
index 1cc982b134..ab9a458744 100644
|
|
--- a/thirdparty/basis_universal/encoder/basisu_enc.cpp
|
|
+++ b/thirdparty/basis_universal/encoder/basisu_enc.cpp
|
|
@@ -29,7 +29,7 @@
|
|
#ifndef TINYEXR_USE_ZFP
|
|
#define TINYEXR_USE_ZFP (1)
|
|
#endif
|
|
-#include "3rdparty/tinyexr.h"
|
|
+#include <tinyexr.h>
|
|
|
|
#ifndef MINIZ_HEADER_FILE_ONLY
|
|
#define MINIZ_HEADER_FILE_ONLY
|
|
@@ -3420,7 +3420,8 @@ namespace basisu
|
|
float* out_rgba = nullptr;
|
|
const char* err = nullptr;
|
|
|
|
- int status = LoadEXRWithLayer(&out_rgba, &width, &height, pFilename, nullptr, &err, &n_chans);
|
|
+ int status = LoadEXRWithLayer(&out_rgba, &width, &height, pFilename, nullptr, &err);
|
|
+ n_chans = 4;
|
|
if (status != 0)
|
|
{
|
|
error_printf("Failed loading .EXR image \"%s\"! (TinyEXR error: %s)\n", pFilename, err ? err : "?");
|