godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stb_vorbis: Update to upstream version 1.16 

(cherry picked from commit 3e727bc659)
This commit is contained in:
Rémi Verschelde 2019-07-11 10:16:47 +02:00
parent 2fa9cae76c
commit 9864066ec6
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
COPYRIGHT.txt
View File

@ -287,7 +287,7 @@ License: BSD-3-clause
Files: ./thirdparty/misc/stb_truetype.h Files: ./thirdparty/misc/stb_truetype.h
./thirdparty/misc/stb_vorbis.c ./thirdparty/misc/stb_vorbis.c
Comment: stb libraries Comment: stb libraries
Copyright: 2007-2017, Sean Barrett Copyright: 2007-2019, Sean Barrett
License: public-domain License: public-domain
Files: ./thirdparty/misc/triangulator.cpp Files: ./thirdparty/misc/triangulator.cpp

2
thirdparty/README.md vendored
View File

@ -307,7 +307,7 @@ Collection of single-file libraries used in Godot components.
* License: Public Domain (Unlicense) or MIT * License: Public Domain (Unlicense) or MIT
- `stb_vorbis.c` - `stb_vorbis.c`
* Upstream: https://github.com/nothings/stb * Upstream: https://github.com/nothings/stb
* Version: 1.15 * Version: 1.16
* License: Public Domain (Unlicense) or MIT * License: Public Domain (Unlicense) or MIT

11
thirdparty/misc/stb_vorbis.c vendored
View File

@ -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/ // http://nothings.org/stb_vorbis/
// //
// Original version written by Sean Barrett in 2007. // Original version written by Sean Barrett in 2007.
@ -33,6 +33,7 @@
// Timur Gagiev // Timur Gagiev
// //
// Partial history: // Partial history:
// 1.16 - 2019-03-04 - fix warnings
// 1.15 - 2019-02-07 - explicit failure if Ogg Skeleton data is found // 1.15 - 2019-02-07 - explicit failure if Ogg Skeleton data is found
// 1.14 - 2018-02-11 - delete bogus dealloca usage // 1.14 - 2018-02-11 - delete bogus dealloca usage
// 1.13 - 2018-01-29 - fix truncation of last frame (hopefully) // 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) 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) if (f)
return stb_vorbis_open_file(f, TRUE, error, alloc); return stb_vorbis_open_file(f, TRUE, error, alloc);
if (error) *error = VORBIS_file_open_failure; if (error) *error = VORBIS_file_open_failure;