mirror of
https://github.com/Relintai/pandemonium_engine.git
synced 2024-12-22 11:56:49 +01:00
tinyexr: Update to 1.0.8
(cherry picked from commit ab14dec952f0210448b6a2575cc0f73e7a074440)
This commit is contained in:
parent
7d60fb20bb
commit
d4078c5568
2
thirdparty/README.md
vendored
2
thirdparty/README.md
vendored
@ -434,7 +434,7 @@ comments and a patch is provided in the squish/ folder.
|
|||||||
## tinyexr
|
## tinyexr
|
||||||
|
|
||||||
- Upstream: https://github.com/syoyo/tinyexr
|
- Upstream: https://github.com/syoyo/tinyexr
|
||||||
- Version: 1.0.7 (6e8cac308cdf4d717078f3f37c4aa39bf3b356b4, 2023)
|
- Version: 1.0.8 (6c8742cc8145c8f629698cd8248900990946d6b1, 2024)
|
||||||
- License: BSD-3-Clause
|
- License: BSD-3-Clause
|
||||||
|
|
||||||
Files extracted from upstream source:
|
Files extracted from upstream source:
|
||||||
|
14
thirdparty/tinyexr/tinyexr.h
vendored
14
thirdparty/tinyexr/tinyexr.h
vendored
@ -386,7 +386,7 @@ extern int IsEXRFromMemory(const unsigned char *memory, size_t size);
|
|||||||
// error
|
// error
|
||||||
extern int SaveEXRToMemory(const float *data, const int width, const int height,
|
extern int SaveEXRToMemory(const float *data, const int width, const int height,
|
||||||
const int components, const int save_as_fp16,
|
const int components, const int save_as_fp16,
|
||||||
const unsigned char **buffer, const char **err);
|
unsigned char **buffer, const char **err);
|
||||||
|
|
||||||
// @deprecated { Not recommended, but handy to use. }
|
// @deprecated { Not recommended, but handy to use. }
|
||||||
// Saves single-frame OpenEXR image to a buffer. Assume EXR image contains RGB(A) channels.
|
// Saves single-frame OpenEXR image to a buffer. Assume EXR image contains RGB(A) channels.
|
||||||
@ -780,7 +780,7 @@ static void cpy2(unsigned short *dst_val, const unsigned short *src_val) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void swap2(unsigned short *val) {
|
static void swap2(unsigned short *val) {
|
||||||
#ifdef TINYEXR_LITTLE_ENDIAN
|
#if TINYEXR_LITTLE_ENDIAN
|
||||||
(void)val;
|
(void)val;
|
||||||
#else
|
#else
|
||||||
unsigned short tmp = *val;
|
unsigned short tmp = *val;
|
||||||
@ -839,7 +839,7 @@ static void cpy4(float *dst_val, const float *src_val) {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void swap4(unsigned int *val) {
|
static void swap4(unsigned int *val) {
|
||||||
#ifdef TINYEXR_LITTLE_ENDIAN
|
#if TINYEXR_LITTLE_ENDIAN
|
||||||
(void)val;
|
(void)val;
|
||||||
#else
|
#else
|
||||||
unsigned int tmp = *val;
|
unsigned int tmp = *val;
|
||||||
@ -854,7 +854,7 @@ static void swap4(unsigned int *val) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void swap4(int *val) {
|
static void swap4(int *val) {
|
||||||
#ifdef TINYEXR_LITTLE_ENDIAN
|
#if TINYEXR_LITTLE_ENDIAN
|
||||||
(void)val;
|
(void)val;
|
||||||
#else
|
#else
|
||||||
int tmp = *val;
|
int tmp = *val;
|
||||||
@ -869,7 +869,7 @@ static void swap4(int *val) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void swap4(float *val) {
|
static void swap4(float *val) {
|
||||||
#ifdef TINYEXR_LITTLE_ENDIAN
|
#if TINYEXR_LITTLE_ENDIAN
|
||||||
(void)val;
|
(void)val;
|
||||||
#else
|
#else
|
||||||
float tmp = *val;
|
float tmp = *val;
|
||||||
@ -900,7 +900,7 @@ static void cpy8(tinyexr::tinyexr_uint64 *dst_val, const tinyexr::tinyexr_uint64
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
static void swap8(tinyexr::tinyexr_uint64 *val) {
|
static void swap8(tinyexr::tinyexr_uint64 *val) {
|
||||||
#ifdef TINYEXR_LITTLE_ENDIAN
|
#if TINYEXR_LITTLE_ENDIAN
|
||||||
(void)val;
|
(void)val;
|
||||||
#else
|
#else
|
||||||
tinyexr::tinyexr_uint64 tmp = (*val);
|
tinyexr::tinyexr_uint64 tmp = (*val);
|
||||||
@ -9008,7 +9008,7 @@ int LoadEXRMultipartImageFromFile(EXRImage *exr_images,
|
|||||||
}
|
}
|
||||||
|
|
||||||
int SaveEXRToMemory(const float *data, int width, int height, int components,
|
int SaveEXRToMemory(const float *data, int width, int height, int components,
|
||||||
const int save_as_fp16, const unsigned char **outbuf, const char **err) {
|
const int save_as_fp16, unsigned char **outbuf, const char **err) {
|
||||||
|
|
||||||
if ((components == 1) || components == 3 || components == 4) {
|
if ((components == 1) || components == 3 || components == 4) {
|
||||||
// OK
|
// OK
|
||||||
|
Loading…
Reference in New Issue
Block a user