Fixed crash if some initialization succeeded and some didn't, thanks …

…to Dongwon Kang
libsdl-org · Feb 15, 2016 · 156d34d · 156d34d
1 parent 934c4fb
commit 156d34d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/IMG_jpg.c b/IMG_jpg.c
@@ -386,7 +386,7 @@ SDL_Surface *IMG_LoadJPG_RW(SDL_RWops *src)
     }
     start = SDL_RWtell(src);
 
-    if ( !IMG_Init(IMG_INIT_JPG) ) {
+    if ( (IMG_Init(IMG_INIT_JPG) & IMG_INIT_JPG) == 0 ) {
         return NULL;
     }
 

diff --git a/IMG_png.c b/IMG_png.c
@@ -362,7 +362,7 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src)
     }
     start = SDL_RWtell(src);
 
-    if ( !IMG_Init(IMG_INIT_PNG) ) {
+    if ( (IMG_Init(IMG_INIT_PNG) & IMG_INIT_PNG) == 0 ) {
         return NULL;
     }
 

diff --git a/IMG_tif.c b/IMG_tif.c
@@ -217,7 +217,7 @@ SDL_Surface* IMG_LoadTIF_RW(SDL_RWops* src)
     }
     start = SDL_RWtell(src);
 
-    if ( !IMG_Init(IMG_INIT_TIF) ) {
+    if ( (IMG_Init(IMG_INIT_TIF) & IMG_INIT_TIF) == 0 ) {
         return NULL;
     }
 

diff --git a/IMG_webp.c b/IMG_webp.c
@@ -196,7 +196,7 @@ SDL_Surface *IMG_LoadWEBP_RW(SDL_RWops *src)
 
     start = SDL_RWtell(src);
 
-    if ( !IMG_Init(IMG_INIT_WEBP) ) {
+    if ( (IMG_Init(IMG_INIT_WEBP) & IMG_INIT_WEBP) == 0 ) {
         goto error;
     }