From 24250824de13015434612cacf4e0a408a1c79b71 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 20 Jan 2005 01:26:15 +0000 Subject: [PATCH] At the cost of losing change history, I'm renaming a couple "SDL" filenames that no longer have any connection to SDL; the names are just too confusing. --- stepmania/src/BannerCache.cpp | 2 +- stepmania/src/Makefile.am | 4 ++-- stepmania/src/RageBitmapTexture.cpp | 6 +++--- stepmania/src/RageDisplay.cpp | 2 +- .../src/{SDL_rotozoom.cpp => RageSurfaceUtils_Zoom.cpp} | 2 +- stepmania/src/{SDL_rotozoom.h => RageSurfaceUtils_Zoom.h} | 0 stepmania/src/SDL_utils.cpp | 2 +- stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) rename stepmania/src/{SDL_rotozoom.cpp => RageSurfaceUtils_Zoom.cpp} (99%) rename stepmania/src/{SDL_rotozoom.h => RageSurfaceUtils_Zoom.h} (100%) diff --git a/stepmania/src/BannerCache.cpp b/stepmania/src/BannerCache.cpp index 3aaa32e8b3..5ba9f259fa 100644 --- a/stepmania/src/BannerCache.cpp +++ b/stepmania/src/BannerCache.cpp @@ -9,7 +9,7 @@ #include "Sprite.h" #include "PrefsManager.h" #include "SDL_dither.h" -#include "SDL_rotozoom.h" +#include "RageSurfaceUtils_Zoom.h" #include "RageDisplay.h" #include "RageTexture.h" #include "RageTextureManager.h" diff --git a/stepmania/src/Makefile.am b/stepmania/src/Makefile.am index d91541f969..ca06b21c24 100644 --- a/stepmania/src/Makefile.am +++ b/stepmania/src/Makefile.am @@ -224,8 +224,7 @@ ScoreDisplayNormal.cpp ScoreDisplayNormal.h ScoreDisplayOni.cpp ScoreDisplayOni. ScoreDisplayPercentage.cpp ScoreDisplayPercentage.h ScoreDisplayRave.cpp ScoreDisplayRave.h Helpers = SDL_SaveJPEG.cpp SDL_SaveJPEG.h \ - SDL_dither.cpp SDL_dither.h \ - SDL_rotozoom.cpp SDL_rotozoom.h + SDL_dither.cpp SDL_dither.h PCRE = pcre/chartables.c pcre/get.c pcre/internal.h pcre/maketables.c pcre/pcre.c pcre/pcre.h pcre/study.c @@ -251,6 +250,7 @@ RageSoundReader_Chain.cpp RageSoundReader_Chain.h \ RageSoundResampler.cpp RageSoundResampler.h \ RageSurface.cpp RageSurface.h RageSurfaceUtils.cpp RageSurfaceUtils.h \ RageSurfaceUtils_Palettize.cpp RageSurfaceUtils_Palettize.h \ +RageSurfaceUtils_Zoom.cpp RageSurfaceUtils_Zoom.h \ RageSurface_Load.cpp RageSurface_Load.h RageSurface_Load_PNG.cpp RageSurface_Load_PNG.h \ RageSurface_Load_JPEG.cpp RageSurface_Load_JPEG.h RageSurface_Load_GIF.cpp RageSurface_Load_GIF.h \ RageSurface_Load_BMP.cpp RageSurface_Load_BMP.h \ diff --git a/stepmania/src/RageBitmapTexture.cpp b/stepmania/src/RageBitmapTexture.cpp index 4f69838a9d..cf874b6e71 100644 --- a/stepmania/src/RageBitmapTexture.cpp +++ b/stepmania/src/RageBitmapTexture.cpp @@ -9,11 +9,11 @@ #include "arch/Dialog/Dialog.h" #include "RageSurface.h" #include "RageSurfaceUtils.h" - -#include "SDL_rotozoom.h" -#include "SDL_dither.h" +#include "RageSurfaceUtils_Zoom.h" #include "RageSurface_Load.h" +#include "SDL_dither.h" + static void GetResolutionFromFileName( CString sPath, int &Width, int &Height ) { /* Match: diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp index 8296926cbd..23d6810944 100644 --- a/stepmania/src/RageDisplay.cpp +++ b/stepmania/src/RageDisplay.cpp @@ -8,7 +8,7 @@ #include "RageFile.h" #include "SDL_SaveJPEG.h" #include "RageSurface_Save_BMP.h" -#include "SDL_rotozoom.h" +#include "RageSurfaceUtils_Zoom.h" #include "RageSurface.h" #include "Preference.h" #include "ScreenDimensions.h" diff --git a/stepmania/src/SDL_rotozoom.cpp b/stepmania/src/RageSurfaceUtils_Zoom.cpp similarity index 99% rename from stepmania/src/SDL_rotozoom.cpp rename to stepmania/src/RageSurfaceUtils_Zoom.cpp index 8333c1480c..fb8ae3ca93 100644 --- a/stepmania/src/SDL_rotozoom.cpp +++ b/stepmania/src/RageSurfaceUtils_Zoom.cpp @@ -1,5 +1,5 @@ #include "global.h" -#include "SDL_rotozoom.h" +#include "RageSurfaceUtils_Zoom.h" #include "RageSurface.h" #include "RageSurfaceUtils.h" #include "RageUtil.h" diff --git a/stepmania/src/SDL_rotozoom.h b/stepmania/src/RageSurfaceUtils_Zoom.h similarity index 100% rename from stepmania/src/SDL_rotozoom.h rename to stepmania/src/RageSurfaceUtils_Zoom.h diff --git a/stepmania/src/SDL_utils.cpp b/stepmania/src/SDL_utils.cpp index bf312a6a6f..48d79ba34b 100644 --- a/stepmania/src/SDL_utils.cpp +++ b/stepmania/src/SDL_utils.cpp @@ -2,13 +2,13 @@ #include "SDL.h" #include "SDL_utils.h" -#include "SDL_rotozoom.h" // for setting icon #include "RageSurface_Load.h" #include "RageFile.h" #include "RageLog.h" #include "RageUtil.h" #include "RageSurface.h" #include "RageSurfaceUtils.h" +#include "RageSurfaceUtils_Zoom.h" #include "RageThreads.h" #include "StepMania.h" diff --git a/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp b/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp index 08df1c8a4a..f54eed5976 100644 --- a/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp +++ b/stepmania/src/arch/LoadingWindow/LoadingWindow_SDL.cpp @@ -3,12 +3,12 @@ #include "SDL_utils.h" #include "RageSurface_Load_XPM.h" #include "SDL_video.h" -#include "SDL_rotozoom.h" #include "LoadingWindow_SDL.h" #include "loading.xpm" #include "StepMania.xpm" /* icon */ #include "RageSurface.h" #include "RageSurfaceUtils.h" +#include "RageSurfaceUtils_Zoom.h" /* XXX: What is all this Xbox junk doing in LoadingWindow_SDL? */