[Scummvm-cvs-logs] scummvm master -> 0c7f795c5bfac931436d1089aa97a15906b3f1a7

lordhoto lordhoto at gmail.com
Tue Jan 7 01:49:37 CET 2014


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
97953ff40d SDL: Fix return value of getDefaultGraphicsMode when scalers are disabled.
0c7f795c5b SDL: Silence unused variable warning when scalers are disabled.


Commit: 97953ff40d1281da7bf3d7fe466db6d317c466d5
    https://github.com/scummvm/scummvm/commit/97953ff40d1281da7bf3d7fe466db6d317c466d5
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-01-06T16:46:28-08:00

Commit Message:
SDL: Fix return value of getDefaultGraphicsMode when scalers are disabled.

Changed paths:
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp



diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index c946b8e..9b71a1e 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() {


Commit: 0c7f795c5bfac931436d1089aa97a15906b3f1a7
    https://github.com/scummvm/scummvm/commit/0c7f795c5bfac931436d1089aa97a15906b3f1a7
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-01-06T16:47:43-08:00

Commit Message:
SDL: Silence unused variable warning when scalers are disabled.

Changed paths:
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp



diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 9b71a1e..0a4dcf3 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)






More information about the Scummvm-git-logs mailing list