From 97953ff40d1281da7bf3d7fe466db6d317c466d5 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 7 Jan 2014 01:46:28 +0100
Subject: SDL: Fix return value of getDefaultGraphicsMode when scalers are
 disabled.

---
 backends/graphics/surfacesdl/surfacesdl-graphics.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'backends/graphics/surfacesdl')

diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index c946b8e747..9b71a1e3a4 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -267,7 +267,11 @@ const OSystem::GraphicsMode *SurfaceSdlGraphicsManager::getSupportedGraphicsMode
 }
 
 int SurfaceSdlGraphicsManager::getDefaultGraphicsMode() const {
+#ifdef USE_SCALERS
 	return GFX_DOUBLESIZE;
+#else
+	return GFX_NORMAL;
+#endif
 }
 
 void SurfaceSdlGraphicsManager::resetGraphicsScale() {
-- 
cgit v1.2.3


From 0c7f795c5bfac931436d1089aa97a15906b3f1a7 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 7 Jan 2014 01:47:43 +0100
Subject: SDL: Silence unused variable warning when scalers are disabled.

---
 backends/graphics/surfacesdl/surfacesdl-graphics.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'backends/graphics/surfacesdl')

diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 9b71a1e3a4..0a4dcf3ea3 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -1080,7 +1080,9 @@ void SurfaceSdlGraphicsManager::internUpdateScreen() {
 		for (r = _dirtyRectList; r != lastRect; ++r) {
 			register int dst_y = r->y + _currentShakePos;
 			register int dst_h = 0;
+#ifdef USE_SCALERS
 			register int orig_dst_y = 0;
+#endif
 			register int rx1 = r->x * scale1;
 
 			if (dst_y < height) {
@@ -1088,7 +1090,9 @@ void SurfaceSdlGraphicsManager::internUpdateScreen() {
 				if (dst_h > height - dst_y)
 					dst_h = height - dst_y;
 
+#ifdef USE_SCALERS
 				orig_dst_y = dst_y;
+#endif
 				dst_y = dst_y * scale1;
 
 				if (_videoMode.aspectRatioCorrection && !_overlayVisible)
-- 
cgit v1.2.3