summaryrefslogtreecommitdiff
path: root/src/resources
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-08-23 20:14:42 +0300
committerAndrei Karas <akaras@inbox.ru>2013-08-24 21:08:16 +0300
commit86a8a11c5fd21cdff2336b32a2cc30a8ff1d3f57 (patch)
treea08d9534e77d961c129852ea8fcf8b82455f5f90 /src/resources
parentea2e8f7410f7fc993a2dc65f865f013a68fad1fc (diff)
downloadmv-86a8a11c5fd21cdff2336b32a2cc30a8ff1d3f57.tar.gz
mv-86a8a11c5fd21cdff2336b32a2cc30a8ff1d3f57.tar.bz2
mv-86a8a11c5fd21cdff2336b32a2cc30a8ff1d3f57.tar.xz
mv-86a8a11c5fd21cdff2336b32a2cc30a8ff1d3f57.zip
remove unused sdl2gfx files.
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/image.cpp4
-rw-r--r--src/resources/imagehelper.cpp1
-rw-r--r--src/resources/openglimagehelper.cpp1
-rw-r--r--src/resources/sdl2imagehelper.cpp1
-rw-r--r--src/resources/sdlimagehelper.cpp1
5 files changed, 4 insertions, 4 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index f6d80e61e..7f2fd6fbd 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -40,7 +40,9 @@
#include "resources/subimage.h"
#include <SDL_image.h>
+#ifndef USE_SDL2
#include <SDL_rotozoom.h>
+#endif
#include "debug.h"
@@ -307,6 +309,7 @@ Image* Image::SDLgetScaledImage(const int width, const int height) const
Image* scaledImage = nullptr;
+#ifndef USE_SDL2
if (mSDLSurface)
{
SDL_Surface *const scaledSurface = zoomSurface(mSDLSurface,
@@ -322,6 +325,7 @@ Image* Image::SDLgetScaledImage(const int width, const int height) const
SDL_FreeSurface(scaledSurface);
}
}
+#endif
return scaledImage;
}
diff --git a/src/resources/imagehelper.cpp b/src/resources/imagehelper.cpp
index cdd1672f6..0dce5b40a 100644
--- a/src/resources/imagehelper.cpp
+++ b/src/resources/imagehelper.cpp
@@ -32,7 +32,6 @@
#include "resources/image.h"
#include <SDL_image.h>
-#include <SDL_rotozoom.h>
#include "debug.h"
diff --git a/src/resources/openglimagehelper.cpp b/src/resources/openglimagehelper.cpp
index 67af6655f..0debbe988 100644
--- a/src/resources/openglimagehelper.cpp
+++ b/src/resources/openglimagehelper.cpp
@@ -40,7 +40,6 @@
#include "utils/stringutils.h"
#include <SDL_image.h>
-#include <SDL_rotozoom.h>
#include "debug.h"
diff --git a/src/resources/sdl2imagehelper.cpp b/src/resources/sdl2imagehelper.cpp
index 07f6603e4..a015080d4 100644
--- a/src/resources/sdl2imagehelper.cpp
+++ b/src/resources/sdl2imagehelper.cpp
@@ -34,7 +34,6 @@
#include "resources/image.h"
#include <SDL_image.h>
-#include <SDL_rotozoom.h>
#include "debug.h"
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index ca8978ded..7a1953444 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -34,7 +34,6 @@
#include "resources/image.h"
#include <SDL_image.h>
-#include <SDL_rotozoom.h>
#include "debug.h"