Merge branch 'fix_issue_745' of https://github.com/BlackMATov/stb into work2

This commit is contained in:
Sean Barrett 2020-02-02 08:21:46 -08:00
commit 81d1537579

View File

@ -106,6 +106,7 @@ RECENT REVISION HISTORY:
Julian Raschke Gregory Mullen Baldur Karlsson github:poppolopoppo
Christian Floisand Kevin Schmidt JR Smith github:darealshinji
Blazej Dariusz Roszkowski github:Michaelangel007
Matvey Cherevko
*/
#ifndef STBI_INCLUDE_STB_IMAGE_H
@ -1056,6 +1057,8 @@ static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int re
#endif
#ifndef STBI_NO_PSD
if (stbi__psd_test(s)) return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc);
#else
STBI_NOTUSED(bpc);
#endif
#ifndef STBI_NO_PIC
if (stbi__pic_test(s)) return stbi__pic_load(s,x,y,comp,req_comp, ri);