0003-external-tinyexr.patch 897 B

1234567891011121314151617181920212223
  1. diff --git a/thirdparty/basis_universal/encoder/basisu_enc.cpp b/thirdparty/basis_universal/encoder/basisu_enc.cpp
  2. index 6c0ac0ad37..2bf486a028 100644
  3. --- a/thirdparty/basis_universal/encoder/basisu_enc.cpp
  4. +++ b/thirdparty/basis_universal/encoder/basisu_enc.cpp
  5. @@ -27,7 +27,7 @@
  6. #ifndef TINYEXR_USE_ZFP
  7. #define TINYEXR_USE_ZFP (1)
  8. #endif
  9. -#include "3rdparty/tinyexr.h"
  10. +#include <tinyexr.h>
  11. #ifndef MINIZ_HEADER_FILE_ONLY
  12. #define MINIZ_HEADER_FILE_ONLY
  13. @@ -3257,7 +3257,8 @@ namespace basisu
  14. float* out_rgba = nullptr;
  15. const char* err = nullptr;
  16. - int status = LoadEXRWithLayer(&out_rgba, &width, &height, pFilename, nullptr, &err, &n_chans);
  17. + int status = LoadEXRWithLayer(&out_rgba, &width, &height, pFilename, nullptr, &err);
  18. + n_chans = 4;
  19. if (status != 0)
  20. {
  21. error_printf("Failed loading .EXR image \"%s\"! (TinyEXR error: %s)\n", pFilename, err ? err : "?");