[Scummvm-git-logs] scummvm master -> 62fc4c94bfd5b66fbfa444d686c5e86a84bea562

[bluegr]

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:
62fc4c94bf SDL: Fix compilation without 16 bit colour support


Commit: 62fc4c94bfd5b66fbfa444d686c5e86a84bea562
    https://github.com/scummvm/scummvm/commit/62fc4c94bfd5b66fbfa444d686c5e86a84bea562
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-03-31T15:03:09+03:00

Commit Message:
SDL: Fix compilation without 16 bit colour support

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 22db3bd..304848e 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -469,6 +469,14 @@ OSystem::TransactionError SurfaceSdlGraphicsManager::endGFXTransaction() {
 	return (OSystem::TransactionError)errors;
 }
 
+Graphics::PixelFormat SurfaceSdlGraphicsManager::convertSDLPixelFormat(SDL_PixelFormat *in) const {
+	return Graphics::PixelFormat(in->BytesPerPixel,
+		8 - in->Rloss, 8 - in->Gloss,
+		8 - in->Bloss, 8 - in->Aloss,
+		in->Rshift, in->Gshift,
+		in->Bshift, in->Ashift);
+}
+
 #ifdef USE_RGB_COLOR
 Common::List<Graphics::PixelFormat> SurfaceSdlGraphicsManager::getSupportedFormats() const {
 	assert(!_supportedFormats.empty());
@@ -492,14 +500,6 @@ static void maskToBitCount(Uint32 mask, uint8 &numBits, uint8 &shift) {
 }
 #endif
 
-Graphics::PixelFormat SurfaceSdlGraphicsManager::convertSDLPixelFormat(SDL_PixelFormat *in) const {
-	return Graphics::PixelFormat(in->BytesPerPixel,
-		8 - in->Rloss, 8 - in->Gloss,
-		8 - in->Bloss, 8 - in->Aloss,
-		in->Rshift, in->Gshift,
-		in->Bshift, in->Ashift);
-}
-
 void SurfaceSdlGraphicsManager::detectSupportedFormats() {
 	_supportedFormats.clear();