Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
6a2c2e50
Commit
6a2c2e50
authored
Nov 12, 2019
by
Rémi Verschelde
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tinyexr: Sync with upstream 656bb61
parent
1d0bd3eb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
8 deletions
+19
-8
README.md
thirdparty/README.md
+1
-1
tinyexr.h
thirdparty/tinyexr/tinyexr.h
+18
-7
No files found.
thirdparty/README.md
View file @
6a2c2e50
...
...
@@ -470,7 +470,7 @@ comments and a patch is provided in the squish/ folder.
## tinyexr
-
Upstream: https://github.com/syoyo/tinyexr
-
Version: git (65
f9859, 2018
)
-
Version: git (65
6bb61, 2019
)
-
License: BSD-3-Clause
Files extracted from upstream source:
...
...
thirdparty/tinyexr/tinyexr.h
View file @
6a2c2e50
...
...
@@ -111,13 +111,13 @@ extern "C" {
#define TINYEXR_ERROR_INVALID_ARGUMENT (-3)
#define TINYEXR_ERROR_INVALID_DATA (-4)
#define TINYEXR_ERROR_INVALID_FILE (-5)
#define TINYEXR_ERROR_INVALID_PARAMETER (-
5
)
#define TINYEXR_ERROR_CANT_OPEN_FILE (-
6
)
#define TINYEXR_ERROR_UNSUPPORTED_FORMAT (-
7
)
#define TINYEXR_ERROR_INVALID_HEADER (-
8
)
#define TINYEXR_ERROR_UNSUPPORTED_FEATURE (-
9
)
#define TINYEXR_ERROR_CANT_WRITE_FILE (-1
0
)
#define TINYEXR_ERROR_SERIALZATION_FAILED (-1
1
)
#define TINYEXR_ERROR_INVALID_PARAMETER (-
6
)
#define TINYEXR_ERROR_CANT_OPEN_FILE (-
7
)
#define TINYEXR_ERROR_UNSUPPORTED_FORMAT (-
8
)
#define TINYEXR_ERROR_INVALID_HEADER (-
9
)
#define TINYEXR_ERROR_UNSUPPORTED_FEATURE (-
10
)
#define TINYEXR_ERROR_CANT_WRITE_FILE (-1
1
)
#define TINYEXR_ERROR_SERIALZATION_FAILED (-1
2
)
// @note { OpenEXR file format: http://www.openexr.com/openexrfilelayout.pdf }
...
...
@@ -554,6 +554,10 @@ namespace miniz {
#pragma clang diagnostic ignored "-Wtautological-constant-compare"
#endif
#if __has_warning("-Wextra-semi-stmt")
#pragma clang diagnostic ignored "-Wextra-semi-stmt"
#endif
#endif
/* miniz.c v1.15 - public domain deflate/inflate, zlib-subset, ZIP
...
...
@@ -7625,6 +7629,9 @@ static bool DecompressZip(unsigned char *dst,
#ifdef __clang__
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wsign-conversion"
#if __has_warning("-Wextra-semi-stmt")
#pragma clang diagnostic ignored "-Wextra-semi-stmt"
#endif
#endif
#ifdef _MSC_VER
...
...
@@ -7886,6 +7893,10 @@ static bool DecompressRle(unsigned char *dst,
#pragma clang diagnostic ignored "-Wcast-qual"
#endif
#if __has_warning("-Wextra-semi-stmt")
#pragma clang diagnostic ignored "-Wextra-semi-stmt"
#endif
#endif
//
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment