[Scummvm-git-logs] scummvm master -> dafc55d8b982f0763a3aa1618c358954a018ebab

dreammaster noreply at scummvm.org
Tue Apr 30 05:13:13 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:
dafc55d8b9 GRAPHICS: Add copy operator to Palette


Commit: dafc55d8b982f0763a3aa1618c358954a018ebab
    https://github.com/scummvm/scummvm/commit/dafc55d8b982f0763a3aa1618c358954a018ebab
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2024-04-29T22:13:00-07:00

Commit Message:
GRAPHICS: Add copy operator to Palette

Changed paths:
    graphics/palette.cpp
    graphics/palette.h


diff --git a/graphics/palette.cpp b/graphics/palette.cpp
index a332187494a..6e6797af05b 100644
--- a/graphics/palette.cpp
+++ b/graphics/palette.cpp
@@ -47,6 +47,19 @@ Palette::~Palette() {
 	delete[] _data;
 }
 
+Palette &Palette::operator=(const Palette &rhs) {
+	delete[] _data;
+	_data = nullptr;
+	_size = rhs._size;
+
+	if (_size > 0) {
+		_data = new byte[_size * 3]();
+		memcpy(_data, rhs._data, _size * 3);
+	}
+
+	return *this;
+}
+
 bool Palette::equals(const Palette &p) const {
 	return p._size == _size && !memcmp(_data, p._data, p._size * 3);
 }
diff --git a/graphics/palette.h b/graphics/palette.h
index 24cf0f34f71..dac9875574a 100644
--- a/graphics/palette.h
+++ b/graphics/palette.h
@@ -62,6 +62,7 @@ public:
 
 	~Palette();
 
+	Palette &operator=(const Palette &rhs);
 	bool operator==(const Palette &rhs) const { return equals(rhs); }
 	bool operator!=(const Palette &rhs) const { return !equals(rhs); }
 




More information about the Scummvm-git-logs mailing list