[Scummvm-git-logs] scummvm master -> f422bf985c7a56780f05a57268fc5d80023c5628
dreammaster
noreply at scummvm.org
Mon Dec 16 09:46:26 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:
f422bf985c GRAPHICS: Fix copying ManagedSurface to copy transparency info
Commit: f422bf985c7a56780f05a57268fc5d80023c5628
https://github.com/scummvm/scummvm/commit/f422bf985c7a56780f05a57268fc5d80023c5628
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-12-16T01:46:12-08:00
Commit Message:
GRAPHICS: Fix copying ManagedSurface to copy transparency info
Changed paths:
graphics/managed_surface.cpp
diff --git a/graphics/managed_surface.cpp b/graphics/managed_surface.cpp
index 9d8093f6cff..b1810641af4 100644
--- a/graphics/managed_surface.cpp
+++ b/graphics/managed_surface.cpp
@@ -152,13 +152,13 @@ ManagedSurface &ManagedSurface::operator=(const ManagedSurface &surf) {
_innerSurface.h = surf.h;
_innerSurface.pitch = surf.pitch;
this->format = surf.format;
-
- // Copy miscellaneous properties
- _transparentColorSet = surf._transparentColorSet;
- _transparentColor = surf._transparentColor;
- _palette = surf._palette ? new Palette(*surf._palette) : nullptr;
}
+ // Copy miscellaneous properties
+ _transparentColorSet = surf._transparentColorSet;
+ _transparentColor = surf._transparentColor;
+ _palette = surf._palette ? new Palette(*surf._palette) : nullptr;
+
return *this;
}
More information about the Scummvm-git-logs
mailing list