[Scummvm-git-logs] scummvm master -> 2b28ccbf2404caef1b9f0cfd81432768795ca2ea

neuromancer noreply at scummvm.org
Mon Mar 20 12:26:54 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:
2b28ccbf24 FREESCAPE: removed invalid assert in convertImageFormatIfNecessary


Commit: 2b28ccbf2404caef1b9f0cfd81432768795ca2ea
    https://github.com/scummvm/scummvm/commit/2b28ccbf2404caef1b9f0cfd81432768795ca2ea
Author: neuromancer (gustavo.grieco at gmail.com)
Date: 2023-03-20T13:26:47+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 8be8944929c..f55548c7a70 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());
 	byte *palette = (byte *)malloc(sizeof(byte) * 16 * 3);




More information about the Scummvm-git-logs mailing list