qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-22 07:02:29 +02:00
Code

Implement the standard set of copy and move operations for Surface

Browse Source
This commit is contained in:
Maarten ter Huurne 2014-08-10 03:18:32 +02:00
parent 614f74a63d
commit 5a281cf661
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/surface.cpp
View File

@ -28,6 +28,7 @@
#include <algorithm>
#include <cassert>
#include <iomanip>
#include <utility>
using namespace std;
@ -94,22 +95,44 @@ Surface::Surface(SDL_Surface *raw_, bool freeWhenDone_)
{
}
Surface::Surface(Surface *s) {
raw = SDL_ConvertSurface(s->raw, s->raw->format, SDL_SWSURFACE);
Surface::Surface(Surface const& other)
: Surface(SDL_ConvertSurface(
other.raw, other.raw->format, SDL_SWSURFACE), true)
{
// Note: A bug in SDL_ConvertSurface() leaves the per-surface alpha
// undefined when converting from RGBA to RGBA. This can cause
// problems if the surface is later converted to a format without
// an alpha channel, such as the display format.
raw->format->alpha = s->raw->format->alpha;
freeWhenDone = true;
raw->format->alpha = other.raw->format->alpha;
}
Surface::~Surface() {
Surface::Surface(Surface&& other)
: raw(other.raw)
, freeWhenDone(other.freeWhenDone)
{
other.raw = nullptr;
other.freeWhenDone = false;
}
Surface::~Surface()
{
if (freeWhenDone) {
SDL_FreeSurface(raw);
}
}
Surface& Surface::operator=(Surface other)
{
swap(other);
return *this;
}
void Surface::swap(Surface& other)
{
std::swap(raw, other.raw);
std::swap(freeWhenDone, other.freeWhenDone);
}
void Surface::convertToDisplayFormat() {
SDL_Surface *newSurface = SDL_DisplayFormat(raw);
if (newSurface) {

8
src/surface.h
View File

@ -52,8 +52,14 @@ public:
static Surface *loadImage(const std::string &img,
const std::string &skin="", bool loadAlpha=true);
Surface(Surface *s);
// TODO: Remove this once naked Surface pointers are no longer in use.
Surface(Surface *other) : Surface(*other) {}
Surface(Surface const& other);
Surface(Surface&& other);
~Surface();
Surface& operator=(Surface other);
void swap(Surface& other);
/** Converts the underlying surface to the same pixel format as the frame
* buffer, for faster blitting. This removes the alpha channel if the