mirrors
/
nothings-stb
mirror of https://github.com/nothings/stb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'merging' into working

This commit is contained in:
Sean Barrett 2016-12-04 05:39:52 -08:00
parent 4a1523f60a 0b2c06a7e1
commit b9be4fd8df
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
stb_image.h
View File

@ -190,8 +190,9 @@
Laurent Gomila Cort Stratton Sergio Gonzalez romigrou@github Laurent Gomila Cort Stratton Sergio Gonzalez romigrou@github
Aruelien Pocheville Thibault Reuille Cass Everitt Matthew Gregan Aruelien Pocheville Thibault Reuille Cass Everitt Matthew Gregan
Ryamond Barbiero Paul Du Bois Engin Manap snagar@github Ryamond Barbiero Paul Du Bois Engin Manap snagar@github
Michaelangel007@github Oriol Ferrer Mesia socks-the-fox Michaelangel007@github Oriol Ferrer Mesia socks-the-fox Zelex@github
Blazej Dariusz Roszkowski Philipp Wiesemann Josh Tobin rlyeh@github grim210@github
Blazej Dariusz Roszkowski
LICENSE LICENSE
@ -4749,7 +4750,7 @@ static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG"); if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG");
has_trans = 1; has_trans = 1;
if (z->depth == 16) { if (z->depth == 16) {
for (k = 0; k < s->img_n; ++k) tc16[k] = stbi__get16be(s); // copy the values as-is for (k = 0; k < s->img_n; ++k) tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is
} else { } else {
for (k = 0; k < s->img_n; ++k) tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger for (k = 0; k < s->img_n; ++k) tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger
} }
@ -5332,16 +5333,16 @@ errorEnd:
// read 16bit value and convert to 24bit RGB // read 16bit value and convert to 24bit RGB
static void stbi__tga_read_rgb16(stbi__context *s, stbi_uc* out) static void stbi__tga_read_rgb16(stbi__context *s, stbi_uc* out)
{ {
stbi__uint16 px = stbi__get16le(s); stbi__uint16 px = (stbi__uint16)stbi__get16le(s);
stbi__uint16 fiveBitMask = 31; stbi__uint16 fiveBitMask = 31;
// we have 3 channels with 5bits each // we have 3 channels with 5bits each
int r = (px >> 10) & fiveBitMask; int r = (px >> 10) & fiveBitMask;
int g = (px >> 5) & fiveBitMask; int g = (px >> 5) & fiveBitMask;
int b = px & fiveBitMask; int b = px & fiveBitMask;
// Note that this saves the data in RGB(A) order, so it doesn't need to be swapped later // Note that this saves the data in RGB(A) order, so it doesn't need to be swapped later
out[0] = (r * 255)/31; out[0] = (stbi_uc)((r * 255)/31);
out[1] = (g * 255)/31; out[1] = (stbi_uc)((g * 255)/31);
out[2] = (b * 255)/31; out[2] = (stbi_uc)((b * 255)/31);
// some people claim that the most significant bit might be used for alpha // some people claim that the most significant bit might be used for alpha
// (possibly if an alpha-bit is set in the "image descriptor byte") // (possibly if an alpha-bit is set in the "image descriptor byte")
@ -6384,20 +6385,24 @@ static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp)
// Radiance RGBE HDR loader // Radiance RGBE HDR loader
// originally by Nicolas Schulz // originally by Nicolas Schulz
#ifndef STBI_NO_HDR #ifndef STBI_NO_HDR
static int stbi__hdr_test_core(stbi__context *s) static int stbi__hdr_test_core(stbi__context *s, const char *signature)
{ {
const char *signature = "#?RADIANCE\n";
int i; int i;
for (i=0; signature[i]; ++i) for (i=0; signature[i]; ++i)
if (stbi__get8(s) != signature[i]) if (stbi__get8(s) != signature[i])
return 0; return 0;
stbi__rewind(s);
return 1; return 1;
} }
static int stbi__hdr_test(stbi__context* s) static int stbi__hdr_test(stbi__context* s)
{ {
int r = stbi__hdr_test_core(s); int r = stbi__hdr_test_core(s, "#?RADIANCE\n");
stbi__rewind(s); stbi__rewind(s);
if(!r) {
r = stbi__hdr_test_core(s, "#?RGBE\n");
stbi__rewind(s);
}
return r; return r;
} }
@ -6462,10 +6467,12 @@ static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int re
int len; int len;
unsigned char count, value; unsigned char count, value;
int i, j, k, c1,c2, z; int i, j, k, c1,c2, z;
const char *headerToken;
STBI_NOTUSED(ri); STBI_NOTUSED(ri);
// Check identifier // Check identifier
if (strcmp(stbi__hdr_gettoken(s,buffer), "#?RADIANCE") != 0) headerToken = stbi__hdr_gettoken(s,buffer);
if (strcmp(headerToken, "#?RADIANCE") != 0 && strcmp(headerToken, "#?RGBE") != 0)
return stbi__errpf("not HDR", "Corrupt HDR image"); return stbi__errpf("not HDR", "Corrupt HDR image");
// Parse header // Parse header

4
tests/stb.dsp
View File

@ -90,10 +90,6 @@ SOURCE=.\grid_reachability.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\docs\other_libs.md
# End Source File
# Begin Source File
SOURCE=.\stb.c SOURCE=.\stb.c
# End Source File # End Source File
# Begin Source File # Begin Source File

4
tests/test_vorbis.c
View File

@ -1,3 +1,7 @@
#define STB_IMAGE_STATIC
#define STB_IMAGE_IMPLEMENTATION
#include "stb_image.h"
#define STB_VORBIS_HEADER_ONLY #define STB_VORBIS_HEADER_ONLY
#include "stb_vorbis.c" #include "stb_vorbis.c"
#include "stb.h" #include "stb.h"