Apply Guichan's changes from 2c7c2d51801b53adc198446ba3e3b430b1bccd45…

… (May 1st 2009) convertToDisplayFormat has been changed so it now throws an exception if conversion fails.
kallisti5 · Sep 17, 2024 · dab26d8 · dab26d8
1 parent fa8d936
commit dab26d8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/TODO b/TODO
@@ -1,4 +1,4 @@
-* Continue rebasing from 248c226d245db0d735653e057dd48d437d0e9eee
+* Continue rebasing from 3437d59c7393d5fafe151582d285b3665399a7b7
 * Add a focus listener interface.
 * Make focus apply synchronously.
 * Graphics and input objects for DirectX.

diff --git a/src/sdl/sdlimage.cpp b/src/sdl/sdlimage.cpp
@@ -174,6 +174,11 @@ namespace gcn
         SDL_FreeSurface(mSurface);
         mSurface = NULL;
 
+        if (tmp == NULL)
+        {
+            throw GCN_EXCEPTION("Unable to convert image to display format.");
+        }
+
         if (hasPink)
         {
             SDL_SetColorKey(tmp, SDL_TRUE,
@@ -191,7 +196,7 @@ namespace gcn
             SDL_SetTextureBlendMode(tmpTexture, SDL_BLENDMODE_BLEND);
             SDL_DestroyTexture(mTexture);
             mTexture = tmpTexture;
-        }	
+        }
     }
 
     void SDLImage::free()