From ac58bafad5bb3194bd3c20fb87cafc42a8068af9 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 4 Dec 2003 20:43:22 +0000
Subject: [PATCH] use SDL_LoadImage

---
 stepmania/src/BannerCache.cpp       | 3 +--
 stepmania/src/RageBitmapTexture.cpp | 3 +--
 stepmania/src/Song.cpp              | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/stepmania/src/BannerCache.cpp b/stepmania/src/BannerCache.cpp
index b43d2731a2..07ab398ade 100644
--- a/stepmania/src/BannerCache.cpp
+++ b/stepmania/src/BannerCache.cpp
@@ -15,7 +15,6 @@
 #include "PrefsManager.h"
 #include "SDL_utils.h"
 #include "SDL_dither.h"
-#include "SDL_image.h"
 #include "SDL_rotozoom.h"
 #include "SDL_utils.h"
 #include "RageDisplay.h"
@@ -305,7 +304,7 @@ void BannerCache::CacheBanner( CString BannerPath )
 
 void BannerCache::CacheBannerInternal( CString BannerPath )
 {
-	SDL_Surface *img = IMG_Load( BannerPath );
+	SDL_Surface *img = SDL_LoadImage( BannerPath );
 	if(img == NULL)
 		RageException::Throw( "BannerCache::CacheBanner: Couldn't load %s: %s", BannerPath.c_str(), SDL_GetError() );
 
diff --git a/stepmania/src/RageBitmapTexture.cpp b/stepmania/src/RageBitmapTexture.cpp
index 06ce47a4b1..fc6fbd90a3 100644
--- a/stepmania/src/RageBitmapTexture.cpp
+++ b/stepmania/src/RageBitmapTexture.cpp
@@ -21,7 +21,6 @@
 #include "arch/ArchHooks/ArchHooks.h"
 
 #include "SDL.h"
-#include "SDL_image.h"
 #include "SDL_endian.h"
 #include "SDL_rotozoom.h"
 #include "SDL_utils.h"
@@ -83,7 +82,7 @@ void RageBitmapTexture::Create()
 	/* Create (and return) a surface ready to be loaded to OpenGL */
 	/* Load the image into an SDL surface. */
 	ResolvePath( actualID.filename );
-	SDL_Surface *img = IMG_Load( actualID.filename );
+	SDL_Surface *img = SDL_LoadImage( actualID.filename );
 
 	/* XXX: Wait, we don't want to throw for all images; in particular, we
 	 * want to tolerate corrupt/unknown background images. */
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index f9a0b8fd90..14df9af4ed 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -32,6 +32,7 @@
 #include "arch/arch.h"
 #include "RageFile.h"
 #include "NoteDataUtil.h"
+#include "SDL_utils.h"
 
 #include "NotesLoaderSM.h"
 #include "NotesLoaderDWI.h"
@@ -43,7 +44,6 @@
 #include "LyricsLoader.h"
 
 #include "SDL.h"
-#include "SDL_image.h"
 
 #include <set>
 
@@ -580,7 +580,7 @@ static void DeleteDuplicateSteps( Song *song, vector<Steps*> &vSteps )
 
 static bool ImageIsLoadable( const CString &sPath )
 {
-	SDL_Surface *img = IMG_Load( sPath );
+	SDL_Surface *img = SDL_LoadImage( sPath );
 	if( !img )
 	{
 		LOG->Warn( "Error loading song image \"%s\": %s", sPath.c_str(), SDL_GetError() );
@@ -821,7 +821,7 @@ void Song::TidyUpData()
 			continue;	// skip
 
 		CString sPath = m_sSongDir + arrayImages[i];
-		SDL_Surface *img = IMG_Load( sPath );
+		SDL_Surface *img = SDL_LoadImage( sPath );
 		if( !img )
 		{
 			LOG->Trace("Couldn't load '%s': %s", sPath.c_str(), SDL_GetError());