[Scummvm-git-logs] scummvm master -> 107b60ad06dfcd826adc60e64b77ea847055bde4

[lephilousophe]

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:
107b60ad06 BACKENDS: OPENGL: Fix segfault when compiled without RGB color


Commit: 107b60ad06dfcd826adc60e64b77ea847055bde4
    https://github.com/scummvm/scummvm/commit/107b60ad06dfcd826adc60e64b77ea847055bde4
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2024-11-09T23:56:16+01:00

Commit Message:
BACKENDS: OPENGL: Fix segfault when compiled without RGB color

The cursor is not impacted by this option, only the game screen.
This fixes bug 15251.

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


diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index 0a76771186a..b8899fc4bbb 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -914,15 +914,11 @@ void OpenGLGraphicsManager::setMouseCursor(const void *buf, uint w, uint h, int
 
 	Graphics::PixelFormat inputFormat;
 	Graphics::PixelFormat maskFormat;
-#ifdef USE_RGB_COLOR
 	if (format) {
 		inputFormat = *format;
 	} else {
 		inputFormat = Graphics::PixelFormat::createFormatCLUT8();
 	}
-#else
-	inputFormat = Graphics::PixelFormat::createFormatCLUT8();
-#endif
 
 #ifdef USE_SCALERS
 	bool wantScaler = (_currentState.scaleFactor > 1) && !dontScale && _scalerPlugins[_currentState.scalerIndex]->get<ScalerPluginObject>().canDrawCursor();