[Scummvm-git-logs] scummvm branch-2-7 -> ac8529413a4fc3a333e64b3859483f0f9cce6668

neuromancer noreply at scummvm.org
Mon Mar 20 12:26:44 UTC 2023


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:
ac8529413a FREESCAPE: removed invalid assert in convertImageFormatIfNecessary


Commit: ac8529413a4fc3a333e64b3859483f0f9cce6668
    https://github.com/scummvm/scummvm/commit/ac8529413a4fc3a333e64b3859483f0f9cce6668
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-03-20T13:27:18+01:00

Commit Message:
FREESCAPE: removed invalid assert in convertImageFormatIfNecessary

Changed paths:
    engines/freescape/gfx.cpp


diff --git a/engines/freescape/gfx.cpp b/engines/freescape/gfx.cpp
index ce79099c1b5..58068d0a0eb 100644
--- a/engines/freescape/gfx.cpp
+++ b/engines/freescape/gfx.cpp
@@ -441,7 +441,6 @@ Graphics::Surface *Renderer::convertImageFormatIfNecessary(Graphics::ManagedSurf
 	if (!msurface)
 		return nullptr;
 
-	assert(msurface->format != _texturePixelFormat);
 	Graphics::Surface *surface = new Graphics::Surface();
 	surface->copyFrom(msurface->rawSurface());
 	const uint32 *src = msurface->getPalette();




More information about the Scummvm-git-logs mailing list