Browse Source

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

Sean Barrett 5 years ago
parent
commit
81d1537579
1 changed files with 3 additions and 0 deletions
  1. 3 0
      stb_image.h

+ 3 - 0
stb_image.h

@@ -106,6 +106,7 @@ RECENT REVISION HISTORY:
     Julian Raschke          Gregory Mullen     Baldur Karlsson    github:poppolopoppo
     Julian Raschke          Gregory Mullen     Baldur Karlsson    github:poppolopoppo
     Christian Floisand      Kevin Schmidt      JR Smith           github:darealshinji
     Christian Floisand      Kevin Schmidt      JR Smith           github:darealshinji
     Blazej Dariusz Roszkowski                                     github:Michaelangel007
     Blazej Dariusz Roszkowski                                     github:Michaelangel007
+    Matvey Cherevko
 */
 */
 
 
 #ifndef STBI_INCLUDE_STB_IMAGE_H
 #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
    #endif
    #ifndef STBI_NO_PSD
    #ifndef STBI_NO_PSD
    if (stbi__psd_test(s))  return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc);
    if (stbi__psd_test(s))  return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc);
+   #else
+   STBI_NOTUSED(bpc);
    #endif
    #endif
    #ifndef STBI_NO_PIC
    #ifndef STBI_NO_PIC
    if (stbi__pic_test(s))  return stbi__pic_load(s,x,y,comp,req_comp, ri);
    if (stbi__pic_test(s))  return stbi__pic_load(s,x,y,comp,req_comp, ri);