Merge branch 'master' of https://github.com/serge-rgb/stb into working
Conflicts: stb_image_write.h
This commit is contained in:
commit
b9216ddb36
@ -99,6 +99,7 @@ CREDITS:
|
||||
Guillaume Chereau
|
||||
github:jry2
|
||||
github:romigrou
|
||||
Sergio Gonzalez
|
||||
|
||||
LICENSE
|
||||
|
||||
@ -145,9 +146,13 @@ STBIWDEF int stbi_write_hdr_to_func(stbi_write_func *func, void *context, int w,
|
||||
#ifdef STB_IMAGE_WRITE_IMPLEMENTATION
|
||||
|
||||
#ifdef _WIN32
|
||||
#ifndef _CRT_SECURE_NO_WARNINGS
|
||||
#define _CRT_SECURE_NO_WARNINGS
|
||||
#endif
|
||||
#ifndef _CRT_NONSTDC_NO_DEPRECATE
|
||||
#define _CRT_NONSTDC_NO_DEPRECATE
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifndef STBI_WRITE_NO_STDIO
|
||||
#include <stdio.h>
|
||||
|
Loading…
Reference in New Issue
Block a user