diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-11 10:16:47 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-07-11 10:37:28 +0200 |
| commit | 3e727bc659345bd8d4624e53a6256df5f1a43d86 (patch) | |
| tree | 52f19c4124c0dd12167ee26a4c2fd90149cb3e62 | |
| parent | 49ce6bacc338d4279c121e13d4c7434d4318e4e4 (diff) | |
stb_vorbis: Update to upstream version 1.16
| -rw-r--r-- | COPYRIGHT.txt | 2 | ||||
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/misc/stb_vorbis.c | 11 |
3 files changed, 11 insertions, 4 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 326581a492..d5b9715a34 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -301,7 +301,7 @@ License: BSD-3-clause Files: ./thirdparty/misc/stb_truetype.h ./thirdparty/misc/stb_vorbis.c Comment: stb libraries -Copyright: 2007-2017, Sean Barrett +Copyright: 2007-2019, Sean Barrett License: public-domain Files: ./thirdparty/misc/triangulator.cpp diff --git a/thirdparty/README.md b/thirdparty/README.md index dbdf9bbf4f..4daa3b5c48 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -391,7 +391,7 @@ Collection of single-file libraries used in Godot components. * License: Public Domain (Unlicense) or MIT - `stb_vorbis.c` * Upstream: https://github.com/nothings/stb - * Version: 1.15 + * Version: 1.16 * License: Public Domain (Unlicense) or MIT diff --git a/thirdparty/misc/stb_vorbis.c b/thirdparty/misc/stb_vorbis.c index 88276026ef..71af404dae 100644 --- a/thirdparty/misc/stb_vorbis.c +++ b/thirdparty/misc/stb_vorbis.c @@ -1,4 +1,4 @@ -// Ogg Vorbis audio decoder - v1.15 - public domain +// Ogg Vorbis audio decoder - v1.16 - public domain // http://nothings.org/stb_vorbis/ // // Original version written by Sean Barrett in 2007. @@ -33,6 +33,7 @@ // Timur Gagiev // // Partial history: +// 1.16 - 2019-03-04 - fix warnings // 1.15 - 2019-02-07 - explicit failure if Ogg Skeleton data is found // 1.14 - 2018-02-11 - delete bogus dealloca usage // 1.13 - 2018-01-29 - fix truncation of last frame (hopefully) @@ -4990,7 +4991,13 @@ stb_vorbis * stb_vorbis_open_file(FILE *file, int close_on_free, int *error, con stb_vorbis * stb_vorbis_open_filename(const char *filename, int *error, const stb_vorbis_alloc *alloc) { - FILE *f = fopen(filename, "rb"); + FILE *f; +#if defined(_WIN32) && defined(__STDC_WANT_SECURE_LIB__) + if (0 != fopen_s(&f, filename, "rb")) + f = NULL; +#else + f = fopen(filename, "rb"); +#endif if (f) return stb_vorbis_open_file(f, TRUE, error, alloc); if (error) *error = VORBIS_file_open_failure; |