Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tinyexr: Update to 1.0.8 #88702

Merged
merged 1 commit into from
Feb 23, 2024
Merged

tinyexr: Update to 1.0.8 #88702

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion thirdparty/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ comments and a patch is provided in the squish/ folder.
## tinyexr

- Upstream: https://github.com/syoyo/tinyexr
- Version: 1.0.5 (3627ab3060592468d49547b4cdf5353e9e2b50dc, 2023)
- Version: 1.0.8 (6c8742cc8145c8f629698cd8248900990946d6b1, 2024)
- License: BSD-3-Clause

Files extracted from upstream source:
Expand Down
14 changes: 7 additions & 7 deletions thirdparty/tinyexr/tinyexr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ extern int IsEXRFromMemory(const unsigned char *memory, size_t size);
// error
extern int SaveEXRToMemory(const float *data, const int width, const int height,
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. }
// Saves single-frame OpenEXR image to a buffer. Assume EXR image contains RGB(A) channels.
Expand Down Expand Up @@ -780,7 +780,7 @@ static void cpy2(unsigned short *dst_val, const unsigned short *src_val) {
}

static void swap2(unsigned short *val) {
#ifdef TINYEXR_LITTLE_ENDIAN
#if TINYEXR_LITTLE_ENDIAN
(void)val;
#else
unsigned short tmp = *val;
Expand Down Expand Up @@ -839,7 +839,7 @@ static void cpy4(float *dst_val, const float *src_val) {
#endif

static void swap4(unsigned int *val) {
#ifdef TINYEXR_LITTLE_ENDIAN
#if TINYEXR_LITTLE_ENDIAN
(void)val;
#else
unsigned int tmp = *val;
Expand All @@ -854,7 +854,7 @@ static void swap4(unsigned int *val) {
}

static void swap4(int *val) {
#ifdef TINYEXR_LITTLE_ENDIAN
#if TINYEXR_LITTLE_ENDIAN
(void)val;
#else
int tmp = *val;
Expand All @@ -869,7 +869,7 @@ static void swap4(int *val) {
}

static void swap4(float *val) {
#ifdef TINYEXR_LITTLE_ENDIAN
#if TINYEXR_LITTLE_ENDIAN
(void)val;
#else
float tmp = *val;
Expand Down Expand Up @@ -900,7 +900,7 @@ static void cpy8(tinyexr::tinyexr_uint64 *dst_val, const tinyexr::tinyexr_uint64
#endif

static void swap8(tinyexr::tinyexr_uint64 *val) {
#ifdef TINYEXR_LITTLE_ENDIAN
#if TINYEXR_LITTLE_ENDIAN
(void)val;
#else
tinyexr::tinyexr_uint64 tmp = (*val);
Expand Down Expand Up @@ -9008,7 +9008,7 @@ int LoadEXRMultipartImageFromFile(EXRImage *exr_images,
}

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) {
// OK
Expand Down
Loading