[Scummvm-git-logs] scummvm master -> 9203bdcf4e01ba8db1ee99e69f66cc4ea750dad9

[csnover]

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

Summary:
9203bdcf4e SDL: Remove USE_RGB_COLOR #ifdefs from detectSupportedFormats


Commit: 9203bdcf4e01ba8db1ee99e69f66cc4ea750dad9
    https://github.com/scummvm/scummvm/commit/9203bdcf4e01ba8db1ee99e69f66cc4ea750dad9
Author: Colin Snover (github.com at zetafleet.com)
Date: 2017-09-15T23:05:48-05:00

Commit Message:
SDL: Remove USE_RGB_COLOR #ifdefs from detectSupportedFormats

This function is only defined when USE_RGB_COLOR is defined so
these additional conditions are redundant.

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 39d7e14..983b71a 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -532,12 +532,10 @@ void SurfaceSdlGraphicsManager::detectSupportedFormats() {
 	// available format, it will get one that is "cheap" to
 	// use.
 	const Graphics::PixelFormat RGBList[] = {
-#ifdef USE_RGB_COLOR
 		// RGBA8888, ARGB8888, RGB888
 		Graphics::PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0),
 		Graphics::PixelFormat(4, 8, 8, 8, 8, 16, 8, 0, 24),
 		Graphics::PixelFormat(3, 8, 8, 8, 0, 16, 8, 0, 0),
-#endif
 		// RGB565, XRGB1555, RGB555, RGBA4444, ARGB4444
 		Graphics::PixelFormat(2, 5, 6, 5, 0, 11, 5, 0, 0),
 		Graphics::PixelFormat(2, 5, 5, 5, 1, 10, 5, 0, 15),
@@ -546,12 +544,10 @@ void SurfaceSdlGraphicsManager::detectSupportedFormats() {
 		Graphics::PixelFormat(2, 4, 4, 4, 4, 8, 4, 0, 12)
 	};
 	const Graphics::PixelFormat BGRList[] = {
-#ifdef USE_RGB_COLOR
 		// ABGR8888, BGRA8888, BGR888
 		Graphics::PixelFormat(4, 8, 8, 8, 8, 0, 8, 16, 24),
 		Graphics::PixelFormat(4, 8, 8, 8, 8, 8, 16, 24, 0),
 		Graphics::PixelFormat(3, 8, 8, 8, 0, 0, 8, 16, 0),
-#endif
 		// BGR565, XBGR1555, BGR555, ABGR4444, BGRA4444
 		Graphics::PixelFormat(2, 5, 6, 5, 0, 0, 5, 11, 0),
 		Graphics::PixelFormat(2, 5, 5, 5, 1, 0, 5, 10, 15),