sean-m
/
stb
mirror of https://github.com/nothings/stb.git
1
0
Fork 0
Code Issues Releases Activity

quick fixes w/o version updates

pull/102/head
Sean Barrett 2015-02-22 14:26:21 -08:00
parent bdef693b7c
commit 0b05bde303
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stb.h
View File

@ -1400,12 +1400,18 @@ int stb_is_pow2(unsigned int n)
#pragma warning(disable: 4035) // disable warning about no return value #pragma warning(disable: 4035) // disable warning about no return value
int stb_log2_floor(unsigned int n) int stb_log2_floor(unsigned int n)
{ {
#if _MSC_VER > 1700
DWORD i;
_BitScanReverse(&i, n);
return i != 0 ? i : -1;
#else
__asm { __asm {
bsr eax,n bsr eax,n
jnz done jnz done
mov eax,-1 mov eax,-1
} }
done:; done:;
#endif
} }
#pragma warning(pop) #pragma warning(pop)
#else #else

5
stb_image.h
View File

@ -6277,7 +6277,7 @@ STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int
1.21 fix use of 'stbi_uc' in header (reported by jon blow) 1.21 fix use of 'stbi_uc' in header (reported by jon blow)
1.20 added support for Softimage PIC, by Tom Seddon 1.20 added support for Softimage PIC, by Tom Seddon
1.19 bug in interlaced PNG corruption check (found by ryg) 1.19 bug in interlaced PNG corruption check (found by ryg)
1.18 2008-08-02 1.18 (2008-08-02)
fix a threading bug (local mutable static) fix a threading bug (local mutable static)
1.17 support interlaced PNG 1.17 support interlaced PNG
1.16 major bugfix - stbi__convert_format converted one too many pixels 1.16 major bugfix - stbi__convert_format converted one too many pixels
@ -6322,5 +6322,6 @@ STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int
0.52 png handles req_comp=3,4 directly; minor cleanup; jpeg comments 0.52 png handles req_comp=3,4 directly; minor cleanup; jpeg comments
0.51 obey req_comp requests, 1-component jpegs return as 1-component, 0.51 obey req_comp requests, 1-component jpegs return as 1-component,
on 'test' only check type, not whether we support this variant on 'test' only check type, not whether we support this variant
0.50 first released version 0.50 (2006-11-19)
first released version
*/ */