diff options
| author | chai <chaifix@163.com> | 2018-10-23 12:23:58 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2018-10-23 12:23:58 +0800 |
| commit | 40fc27154fe754181934dc7ee31375e6bdfb33fc (patch) | |
| tree | 897ad98d759bc308ef66561181ba88b85f2ccd47 /src/libjin/3rdparty/stb/stb_image.h | |
| parent | 1480c9445100075c9e1a894eb07c0ef727b509a1 (diff) | |
*merge from minimal
Diffstat (limited to 'src/libjin/3rdparty/stb/stb_image.h')
| -rw-r--r-- | src/libjin/3rdparty/stb/stb_image.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libjin/3rdparty/stb/stb_image.h b/src/libjin/3rdparty/stb/stb_image.h index 72e0ae6..4df317a 100644 --- a/src/libjin/3rdparty/stb/stb_image.h +++ b/src/libjin/3rdparty/stb/stb_image.h @@ -22,7 +22,7 @@ JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib) PNG 1/2/4/8/16-bit-per-channel - + TGA (not sure what subset, if a subset) BMP non-1bpp, non-RLE PSD (composited view only, no extra channels, 8/16 bit-per-channel) @@ -79,7 +79,7 @@ RECENT REVISION HISTORY: github:urraka (animated gif) Junggon Kim (PNM comments) Daniel Gibson (16-bit TGA) socks-the-fox (16-bit PNG) - Jeremy Sawicki (handle all ImageNet JPGs) + Jeremy Sawicki (handle all ImageNetManager JPGs) Optimizations & bugfixes Fabian "ryg" Giesen Arseny Kapoulkine @@ -100,7 +100,6 @@ RECENT REVISION HISTORY: Blazej Dariusz Roszkowski Gregory Mullen github:phprus */ -#define STB_IMAGE_IMPLEMENTATION #ifndef STBI_INCLUDE_STB_IMAGE_H #define STBI_INCLUDE_STB_IMAGE_H |