mirror of
https://github.com/SerenityOS/serenity.git
synced 2025-01-23 01:41:59 -05:00
AK: Make Bitmap movable but not copyable.
We were falling back to an incorrect compiler-generated copy ctor for this class, and let's not do that. Found by PVS-Studio.
This commit is contained in:
parent
1a13145cb3
commit
a3ee35510f
1 changed files with 25 additions and 4 deletions
29
AK/Bitmap.h
29
AK/Bitmap.h
|
@ -1,13 +1,15 @@
|
|||
#pragma once
|
||||
|
||||
#include "Assertions.h"
|
||||
#include "StdLibExtras.h"
|
||||
#include "Types.h"
|
||||
#include "kmalloc.h"
|
||||
#include <AK/Assertions.h>
|
||||
#include <AK/Noncopyable.h>
|
||||
#include <AK/StdLibExtras.h>
|
||||
#include <AK/Types.h>
|
||||
#include <AK/kmalloc.h>
|
||||
|
||||
namespace AK {
|
||||
|
||||
class Bitmap {
|
||||
AK_MAKE_NONCOPYABLE(Bitmap)
|
||||
public:
|
||||
// NOTE: A wrapping Bitmap won't try to free the wrapped data.
|
||||
static Bitmap wrap(u8* data, int size)
|
||||
|
@ -25,6 +27,25 @@ public:
|
|||
return Bitmap();
|
||||
}
|
||||
|
||||
Bitmap(Bitmap&& other)
|
||||
{
|
||||
m_owned = exchange(other.m_owned, false);
|
||||
m_data = exchange(other.m_data, nullptr);
|
||||
m_size = exchange(other.m_size, 0);
|
||||
}
|
||||
|
||||
Bitmap& operator=(Bitmap&& other)
|
||||
{
|
||||
if (this != &other) {
|
||||
if (m_owned)
|
||||
kfree(m_data);
|
||||
m_owned = exchange(other.m_owned, false);
|
||||
m_data = exchange(other.m_data, nullptr);
|
||||
m_size = exchange(other.m_size, 0);
|
||||
}
|
||||
return *this;
|
||||
}
|
||||
|
||||
~Bitmap()
|
||||
{
|
||||
if (m_owned)
|
||||
|
|
Loading…
Reference in a new issue