[Scummvm-git-logs] scummvm master -> c900c5e3c7e4e1976e1b363a127d63d45c884df8

dreammaster noreply at scummvm.org
Mon Oct 6 09:56:19 UTC 2025


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

Summary:
c900c5e3c7 BAGEL: MINIGAMES: Fix dibapi compiler warning


Commit: c900c5e3c7e4e1976e1b363a127d63d45c884df8
    https://github.com/scummvm/scummvm/commit/c900c5e3c7e4e1976e1b363a127d63d45c884df8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2025-10-06T02:55:40-07:00

Commit Message:
BAGEL: MINIGAMES: Fix dibapi compiler warning

Changed paths:
    engines/bagel/hodjnpodj/hnplibs/dibapi.cpp


diff --git a/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp b/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
index 919feeeb791..7e7bfbca633 100644
--- a/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
+++ b/engines/bagel/hodjnpodj/hnplibs/dibapi.cpp
@@ -92,7 +92,6 @@ static BITMAPINFO *getDIBInfo(HDIB hDib) {
 
 bool PaintDIB(HDC hDC, LPRECT lpDCRect, HDIB hDIB,
 		LPRECT lpDIBRect, CPalette *pPal) {
-	Graphics::ManagedSurface *surf;
 	bool bSuccess = false;      // Success/fail flag
 	HPALETTE hPal = nullptr;		// Our DIB's palette
 	HPALETTE hOldPal = nullptr;		// Previous palette
@@ -105,9 +104,6 @@ bool PaintDIB(HDC hDC, LPRECT lpDCRect, HDIB hDIB,
 	if (hDIB == nullptr)
 		return false;
 
-	// Lock down the DIB, and get a pointer to it
-	surf = (Graphics::ManagedSurface *)hDIB;
-
 	// Get the palette, then select it into DC
 	if (pPal != nullptr) {
 		hPal = (HPALETTE)pPal->m_hObject;
@@ -155,6 +151,9 @@ bool PaintDIB(HDC hDC, LPRECT lpDCRect, HDIB hDIB,
 	error("TODO: Populate binfo and enable below if this is ever needed");
 #if 0
 	BITMAPINFO bInfo;
+
+	// Lock down the DIB, and get a pointer to it
+	Graphics::ManagedSurface *surf = (Graphics::ManagedSurface *)hDIB;
 	void *lpDIBBits = surf->getPixels();
 
 	// Make sure to use the stretching mode best for color pictures




More information about the Scummvm-git-logs mailing list