mirror of
https://github.com/nothings/stb
synced 2024-12-16 12:52:34 +03:00
Merge branch 'working'
This commit is contained in:
commit
690ad3f9dd
10
stb_image.h
10
stb_image.h
@ -1,4 +1,4 @@
|
|||||||
/* stb_image - v2.14 - public domain image loader - http://nothings.org/stb_image.h
|
/* stb_image - v2.15 - public domain image loader - http://nothings.org/stb_image.h
|
||||||
no warranty implied; use at your own risk
|
no warranty implied; use at your own risk
|
||||||
|
|
||||||
Do this:
|
Do this:
|
||||||
@ -48,6 +48,7 @@ LICENSE
|
|||||||
|
|
||||||
RECENT REVISION HISTORY:
|
RECENT REVISION HISTORY:
|
||||||
|
|
||||||
|
2.15 (2017-03-18) fix png-1,2,4 bug; warnings
|
||||||
2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs
|
2.14 (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs
|
||||||
2.13 (2016-12-04) experimental 16-bit API, only for PNG so far; fixes
|
2.13 (2016-12-04) experimental 16-bit API, only for PNG so far; fixes
|
||||||
2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes
|
2.12 (2016-04-02) fix typo in 2.11 PSD fix that caused crashes
|
||||||
@ -77,7 +78,7 @@ RECENT REVISION HISTORY:
|
|||||||
Ken Miller (pgm, ppm) Richard Mitton (16-bit PSD)
|
Ken Miller (pgm, ppm) Richard Mitton (16-bit PSD)
|
||||||
github:urraka (animated gif) Junggon Kim (PNM comments)
|
github:urraka (animated gif) Junggon Kim (PNM comments)
|
||||||
Daniel Gibson (16-bit TGA)
|
Daniel Gibson (16-bit TGA)
|
||||||
socks-the-fox (16-bit TGA)
|
socks-the-fox (16-bit PNG)
|
||||||
Jeremy Sawicki (handle all ImageNet JPGs)
|
Jeremy Sawicki (handle all ImageNet JPGs)
|
||||||
Optimizations & bugfixes
|
Optimizations & bugfixes
|
||||||
Fabian "ryg" Giesen
|
Fabian "ryg" Giesen
|
||||||
@ -96,7 +97,7 @@ RECENT REVISION HISTORY:
|
|||||||
Ryamond Barbiero Paul Du Bois Engin Manap github:snagar
|
Ryamond Barbiero Paul Du Bois Engin Manap github:snagar
|
||||||
Michaelangel007@github Oriol Ferrer Mesia Dale Weiler github:Zelex
|
Michaelangel007@github Oriol Ferrer Mesia Dale Weiler github:Zelex
|
||||||
Philipp Wiesemann Josh Tobin github:rlyeh github:grim210@github
|
Philipp Wiesemann Josh Tobin github:rlyeh github:grim210@github
|
||||||
Blazej Dariusz Roszkowski github:sammyhw
|
Blazej Dariusz Roszkowski github:sammyhw Gregory Mullen
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -1761,7 +1762,7 @@ static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h)
|
|||||||
// magnitude code followed by receive_extend code
|
// magnitude code followed by receive_extend code
|
||||||
int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits);
|
int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits);
|
||||||
int m = 1 << (magbits - 1);
|
int m = 1 << (magbits - 1);
|
||||||
if (k < m) k += (-1 << magbits) + 1;
|
if (k < m) k += (~0U << magbits) + 1;
|
||||||
// if the result is small enough, we can fit it in fast_ac table
|
// if the result is small enough, we can fit it in fast_ac table
|
||||||
if (k >= -128 && k <= 127)
|
if (k >= -128 && k <= 127)
|
||||||
fast_ac[i] = (stbi__int16) ((k << 8) + (run << 4) + (len + magbits));
|
fast_ac[i] = (stbi__int16) ((k << 8) + (run << 4) + (len + magbits));
|
||||||
@ -3596,6 +3597,7 @@ static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int re
|
|||||||
{
|
{
|
||||||
unsigned char* result;
|
unsigned char* result;
|
||||||
stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg));
|
stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg));
|
||||||
|
STBI_NOTUSED(ri);
|
||||||
j->s = s;
|
j->s = s;
|
||||||
stbi__setup_jpeg(j);
|
stbi__setup_jpeg(j);
|
||||||
result = load_jpeg_image(j, x,y,comp,req_comp);
|
result = load_jpeg_image(j, x,y,comp,req_comp);
|
||||||
|
Loading…
Reference in New Issue
Block a user