[Scummvm-git-logs] scummvm master -> 71c40b90de01881122dfbf0ff1466744d3e99dff
bluegr
noreply at scummvm.org
Mon Mar 3 16:13:06 UTC 2025
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9d871d2ff6 GRAPHICS: Removed deprecated ManagedSurface constructors
71c40b90de TESTS: Remove use of deprecated ManagedSurface constructors
Commit: 9d871d2ff6461abbd671c566e6aa714391205af0
https://github.com/scummvm/scummvm/commit/9d871d2ff6461abbd671c566e6aa714391205af0
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2025-03-03T18:13:02+02:00
Commit Message:
GRAPHICS: Removed deprecated ManagedSurface constructors
Changed paths:
graphics/managed_surface.cpp
graphics/managed_surface.h
diff --git a/graphics/managed_surface.cpp b/graphics/managed_surface.cpp
index 99ac9905746..26abb1c9551 100644
--- a/graphics/managed_surface.cpp
+++ b/graphics/managed_surface.cpp
@@ -87,48 +87,6 @@ ManagedSurface::ManagedSurface(ManagedSurface &surf, const Common::Rect &bounds)
create(surf, bounds);
}
-ManagedSurface::ManagedSurface(Surface *surf, DisposeAfterUse::Flag disposeAfterUse) :
- w(_innerSurface.w), h(_innerSurface.h), pitch(_innerSurface.pitch), format(_innerSurface.format),
- _owner(nullptr), _transparentColor(0), _transparentColorSet(false), _palette(nullptr) {
- if (!surf) {
- _disposeAfterUse = DisposeAfterUse::YES;
-
- return;
- }
-
- if (disposeAfterUse == DisposeAfterUse::YES) {
- _innerSurface.w = surf->w;
- _innerSurface.h = surf->h;
- _innerSurface.pitch = surf->pitch;
- _innerSurface.format = surf->format;
- _innerSurface.setPixels(surf->getPixels());
-
- delete surf;
- } else {
- 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;
-}
-
-ManagedSurface::ManagedSurface(const Surface *surf) :
- w(_innerSurface.w), h(_innerSurface.h), pitch(_innerSurface.pitch), format(_innerSurface.format),
- _owner(nullptr), _transparentColor(0), _transparentColorSet(false), _palette(nullptr) {
- if (!surf) {
- _disposeAfterUse = DisposeAfterUse::YES;
-
- return;
- }
-
- _disposeAfterUse = DisposeAfterUse::NO;
- copyFrom(*surf);
-}
-
ManagedSurface::~ManagedSurface() {
free();
}
diff --git a/graphics/managed_surface.h b/graphics/managed_surface.h
index 1fe2af069a3..d315b5541ed 100644
--- a/graphics/managed_surface.h
+++ b/graphics/managed_surface.h
@@ -160,21 +160,6 @@ public:
*/
ManagedSurface(ManagedSurface &surf, const Common::Rect &bounds);
- /**
- * Create a managed surface from plain Surface.
- *
- * If disposeAfterUse flag is set (default), the surface will reuse all structures
- * from the surface and destroy it, otherwise it will make a copy.
- */
- WARN_DEPRECATED("Use copyFrom() instead")
- ManagedSurface(Surface *surf, DisposeAfterUse::Flag disposeAfterUse = DisposeAfterUse::YES);
-
- /**
- * Create a managed surface from plain Surface.
- */
- WARN_DEPRECATED("Use copyFrom() instead")
- ManagedSurface(const Surface *surf);
-
/**
* Destroy the managed surface.
*/
Commit: 71c40b90de01881122dfbf0ff1466744d3e99dff
https://github.com/scummvm/scummvm/commit/71c40b90de01881122dfbf0ff1466744d3e99dff
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2025-03-03T18:13:02+02:00
Commit Message:
TESTS: Remove use of deprecated ManagedSurface constructors
Changed paths:
test/image/blending.h
diff --git a/test/image/blending.h b/test/image/blending.h
index d898223f1d4..a80ec44bdc8 100644
--- a/test/image/blending.h
+++ b/test/image/blending.h
@@ -54,21 +54,21 @@ namespace OldTransparentSurface {
using namespace Graphics;
-struct OldTransparentSurface : public Graphics::Surface {
+struct OldTransparentSurface : public Graphics::ManagedSurface {
OldTransparentSurface();
- OldTransparentSurface(const Graphics::Surface &surf, bool copyData = false);
+ OldTransparentSurface(const Graphics::ManagedSurface &surf, bool copyData = false);
static PixelFormat getSupportedPixelFormat() {
return PixelFormat(4, 8, 8, 8, 8, 24, 16, 8, 0);
}
- Common::Rect blit(Graphics::Surface &target, int posX = 0, int posY = 0,
+ Common::Rect blit(Graphics::ManagedSurface &target, int posX = 0, int posY = 0,
int flipping = FLIP_NONE,
Common::Rect *pPartRect = nullptr,
uint color = MS_ARGB(255, 255, 255, 255),
int width = -1, int height = -1,
TSpriteBlendMode blend = BLEND_NORMAL);
- Common::Rect blitClip(Graphics::Surface &target, Common::Rect clippingArea,
+ Common::Rect blitClip(Graphics::ManagedSurface &target, Common::Rect clippingArea,
int posX = 0, int posY = 0,
int flipping = FLIP_NONE,
Common::Rect *pPartRect = nullptr,
@@ -103,9 +103,9 @@ static const int kGIndex = 1;
static const int kRIndex = 0;
#endif
-OldTransparentSurface::OldTransparentSurface() : Surface(), _alphaMode(ALPHA_FULL) {}
+OldTransparentSurface::OldTransparentSurface() : ManagedSurface(), _alphaMode(ALPHA_FULL) {}
-OldTransparentSurface::OldTransparentSurface(const Surface &surf, bool copyData) : Surface(), _alphaMode(ALPHA_FULL) {
+OldTransparentSurface::OldTransparentSurface(const ManagedSurface &surf, bool copyData) : ManagedSurface(), _alphaMode(ALPHA_FULL) {
if (copyData) {
copyFrom(surf);
} else {
@@ -116,7 +116,7 @@ OldTransparentSurface::OldTransparentSurface(const Surface &surf, bool copyData)
// We need to cast the const qualifier away here because 'pixels'
// always needs to be writable. 'surf' however is a constant Surface,
// thus getPixels will always return const pixel data.
- pixels = const_cast<void *>(surf.getPixels());
+ setPixels(const_cast<void *>(surf.getPixels()));
}
}
@@ -433,7 +433,7 @@ static void doBlitMultiplyBlend(byte *ino, byte *outo, uint32 width, uint32 heig
}
}
-Common::Rect OldTransparentSurface::blit(Graphics::Surface &target, int posX, int posY, int flipping, Common::Rect *pPartRect, uint color, int width, int height, TSpriteBlendMode blendMode) {
+Common::Rect OldTransparentSurface::blit(Graphics::ManagedSurface &target, int posX, int posY, int flipping, Common::Rect *pPartRect, uint color, int width, int height, TSpriteBlendMode blendMode) {
Common::Rect retSize;
retSize.top = 0;
@@ -468,7 +468,7 @@ Common::Rect OldTransparentSurface::blit(Graphics::Surface &target, int posX, in
xOffset = srcImage.w - pPartRect->right;
}
- srcImage.pixels = getBasePtr(xOffset, yOffset);
+ srcImage.setPixels(getBasePtr(xOffset, yOffset));
srcImage.w = pPartRect->width();
srcImage.h = pPartRect->height();
@@ -493,8 +493,8 @@ Common::Rect OldTransparentSurface::blit(Graphics::Surface &target, int posX, in
height = height * 2 / 3;
#endif
- Graphics::Surface *img = nullptr;
- Graphics::Surface *imgScaled = nullptr;
+ Graphics::ManagedSurface *img = nullptr;
+ Graphics::ManagedSurface *imgScaled = nullptr;
byte *savedPixels = nullptr;
if ((width != srcImage.w) || (height != srcImage.h)) {
// Scale the image
@@ -581,7 +581,7 @@ Common::Rect OldTransparentSurface::blit(Graphics::Surface &target, int posX, in
return retSize;
}
-Common::Rect OldTransparentSurface::blitClip(Graphics::Surface &target, Common::Rect clippingArea, int posX, int posY, int flipping, Common::Rect *pPartRect, uint color, int width, int height, TSpriteBlendMode blendMode) {
+Common::Rect OldTransparentSurface::blitClip(Graphics::ManagedSurface &target, Common::Rect clippingArea, int posX, int posY, int flipping, Common::Rect *pPartRect, uint color, int width, int height, TSpriteBlendMode blendMode) {
Common::Rect retSize;
retSize.top = 0;
retSize.left = 0;
@@ -615,7 +615,7 @@ Common::Rect OldTransparentSurface::blitClip(Graphics::Surface &target, Common::
xOffset = srcImage.w - pPartRect->right;
}
- srcImage.pixels = getBasePtr(xOffset, yOffset);
+ srcImage.setPixels(getBasePtr(xOffset, yOffset));
srcImage.w = pPartRect->width();
srcImage.h = pPartRect->height();
@@ -640,8 +640,8 @@ Common::Rect OldTransparentSurface::blitClip(Graphics::Surface &target, Common::
height = height * 2 / 3;
#endif
- Graphics::Surface *img = nullptr;
- Graphics::Surface *imgScaled = nullptr;
+ Graphics::ManagedSurface *img = nullptr;
+ Graphics::ManagedSurface *imgScaled = nullptr;
byte *savedPixels = nullptr;
if ((width != srcImage.w) || (height != srcImage.h)) {
// Scale the image
@@ -746,7 +746,7 @@ OldTransparentSurface *OldTransparentSurface::scale(int16 newWidth, int16 newHei
} // namespace OldTransparentSurface
#ifdef TEST_IMAGE_BLENDING_SAVE
-static int save_bitmap(const char *path, const Graphics::Surface *surf) {
+static int save_bitmap(const char *path, const Graphics::ManagedSurface *surf) {
Common::FSNode fileNode(path);
Common::SeekableWriteStream *out = fileNode.createWriteStream();
#ifdef SCUMM_LITTLE_ENDIAN
@@ -793,7 +793,7 @@ static int save_bitmap(const char *path, const Graphics::Surface *surf) {
}
#endif
-static bool areSurfacesEqual(const Graphics::Surface *a, const Graphics::Surface *b) {
+static bool areSurfacesEqual(const Graphics::ManagedSurface *a, const Graphics::ManagedSurface *b) {
if (a->w != b->w || a->h != b->h) return false;
return memcmp(a->getPixels(), b->getPixels(), a->h * a->pitch) == 0;
}
@@ -818,7 +818,7 @@ public:
Graphics::BlendBlit::blitFunc = Graphics::BlendBlit::blitAVX2;
}
#endif
- Graphics::Surface baseSurface, destSurface;
+ Graphics::ManagedSurface baseSurface, destSurface;
baseSurface.create(103, 103, OldTransparentSurface::OldTransparentSurface::getSupportedPixelFormat());
destSurface.create(256, 256, OldTransparentSurface::OldTransparentSurface::getSupportedPixelFormat());
for (int y = 0; y < baseSurface.h; y++) {
@@ -830,8 +830,8 @@ public:
OldTransparentSurface::OldTransparentSurface oldSurf(baseSurface, true);
OldTransparentSurface::OldTransparentSurface oldSurfDest(destSurface, true);
- Graphics::ManagedSurface managedSurf(&baseSurface, DisposeAfterUse::NO);
- Graphics::ManagedSurface managedSurfDest(&destSurface, DisposeAfterUse::NO);
+ Graphics::ManagedSurface &managedSurf = baseSurface;
+ Graphics::ManagedSurface &managedSurfDest = destSurface;
int numIters = 0, numItersScaled = 0;
double oldTime = 0.0, newTime = 0.0, genericTime = 0.0;
@@ -929,7 +929,7 @@ public:
Common::Rect(0, 0, 16, 16), // Case 6 (completely bigger)
};
- Graphics::Surface baseSurface, destSurface;
+ Graphics::ManagedSurface baseSurface, destSurface;
baseSurface.create(16, 16, OldTransparentSurface::OldTransparentSurface::getSupportedPixelFormat());
destSurface.create(32, 32, OldTransparentSurface::OldTransparentSurface::getSupportedPixelFormat());
for (int y = 0; y < baseSurface.h; y++) {
More information about the Scummvm-git-logs
mailing list