[Scummvm-git-logs] scummvm master -> 7559ecdf84fff0e2d8bf82001e27d1dd21bc54f8

dreammaster noreply at scummvm.org
Fri Jun 7 03:47:04 UTC 2024


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:
7559ecdf84 GRAPHICS: Copy fields, not surface itself, in ManagedSurface constructor


Commit: 7559ecdf84fff0e2d8bf82001e27d1dd21bc54f8
    https://github.com/scummvm/scummvm/commit/7559ecdf84fff0e2d8bf82001e27d1dd21bc54f8
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-06-06T20:31:03-07:00

Commit Message:
GRAPHICS: Copy fields, not surface itself, in ManagedSurface constructor

Changed paths:
    graphics/managed_surface.cpp


diff --git a/graphics/managed_surface.cpp b/graphics/managed_surface.cpp
index eef0ca3e410..32a63e3b738 100644
--- a/graphics/managed_surface.cpp
+++ b/graphics/managed_surface.cpp
@@ -82,7 +82,12 @@ ManagedSurface::ManagedSurface(Surface *surf, DisposeAfterUse::Flag disposeAfter
 
 		delete surf;
 	} else {
-		copyFrom(*surf);
+		void *srcPixels = surf->getPixels();
+		_innerSurface.setPixels(srcPixels);
+		_innerSurface.w = surf->w;
+		_innerSurface.h = surf->h;
+		_innerSurface.pitch = surf->pitch;
+		this->format = surf->format;
 	}
 
 	_disposeAfterUse = disposeAfterUse;




More information about the Scummvm-git-logs mailing list