|
|
|
@ -296,7 +296,7 @@ STBIW_EXTERN __declspec(dllimport) int __stdcall WideCharToMultiByte(unsigned in |
|
|
|
|
|
|
|
|
|
STBIWDEF int stbiw_convert_wchar_to_utf8(char *buffer, size_t bufferlen, const wchar_t* input) |
|
|
|
|
{ |
|
|
|
|
return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int) bufferlen, NULL, NULL); |
|
|
|
|
return WideCharToMultiByte(65001 /* UTF8 */, 0, input, -1, buffer, (int) bufferlen, NULL, NULL); |
|
|
|
|
} |
|
|
|
|
#endif |
|
|
|
|
|
|
|
|
@ -306,15 +306,15 @@ static FILE *stbiw__fopen(char const *filename, char const *mode) |
|
|
|
|
#if defined(_WIN32) && defined(STBI_WINDOWS_UTF8) |
|
|
|
|
wchar_t wMode[64]; |
|
|
|
|
wchar_t wFilename[1024]; |
|
|
|
|
if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename)/sizeof(*wFilename))) |
|
|
|
|
if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, filename, -1, wFilename, sizeof(wFilename)/sizeof(*wFilename))) |
|
|
|
|
return 0; |
|
|
|
|
|
|
|
|
|
if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode)/sizeof(*wMode))) |
|
|
|
|
if (0 == MultiByteToWideChar(65001 /* UTF8 */, 0, mode, -1, wMode, sizeof(wMode)/sizeof(*wMode))) |
|
|
|
|
return 0; |
|
|
|
|
|
|
|
|
|
#if defined(_MSC_VER) && _MSC_VER >= 1400 |
|
|
|
|
if (0 != _wfopen_s(&f, wFilename, wMode)) |
|
|
|
|
f = 0; |
|
|
|
|
if (0 != _wfopen_s(&f, wFilename, wMode)) |
|
|
|
|
f = 0; |
|
|
|
|
#else |
|
|
|
|
f = _wfopen(wFilename, wMode); |
|
|
|
|
#endif |
|
|
|
@ -1635,7 +1635,7 @@ STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const |
|
|
|
|
add HDR output |
|
|
|
|
fix monochrome BMP |
|
|
|
|
0.95 (2014-08-17) |
|
|
|
|
add monochrome TGA output |
|
|
|
|
add monochrome TGA output |
|
|
|
|
0.94 (2014-05-31) |
|
|
|
|
rename private functions to avoid conflicts with stb_image.h |
|
|
|
|
0.93 (2014-05-27) |
|
|
|
|