diff --git a/CMakeLists.txt b/CMakeLists.txt index f417ab5..5499b80 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,6 +98,7 @@ SET(LIBRARY_SOURCES SDL2pp/Rect.cc SDL2pp/Renderer.cc SDL2pp/SDL.cc + SDL2pp/Surface.cc SDL2pp/Texture.cc SDL2pp/TextureLock.cc SDL2pp/Wav.cc @@ -117,6 +118,7 @@ SET(LIBRARY_HEADERS SDL2pp/SDL.hh SDL2pp/SDL2pp.hh SDL2pp/StreamRWops.hh + SDL2pp/Surface.hh SDL2pp/Texture.hh SDL2pp/Wav.hh SDL2pp/Window.hh diff --git a/SDL2pp/Surface.cc b/SDL2pp/Surface.cc new file mode 100644 index 0000000..0d310c6 --- /dev/null +++ b/SDL2pp/Surface.cc @@ -0,0 +1,62 @@ +/* + libSDL2pp - C++11 bindings/wrapper for SDL2 + Copyright (C) 2014 Dmitry Marakasov + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +#include + +#include +#include + +namespace SDL2pp { + +Surface::Surface(Uint32 flags, int width, int height, int depth, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask) { + if ((surface_ = SDL_CreateRGBSurface(flags, width, height, depth, Rmask, Gmask, Bmask, Amask)) == nullptr) + throw Exception("SDL_CreateRGBSurface failed"); +} + +Surface::Surface(void* pixels, int width, int height, int depth, int pitch, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask) { + if ((surface_ = SDL_CreateRGBSurfaceFrom(pixels, width, height, depth, pitch, Rmask, Gmask, Bmask, Amask)) == nullptr) + throw Exception("SDL_CreateRGBSurfaceFrom failed"); +} + +Surface::~Surface() { + if (surface_ != nullptr) + SDL_FreeSurface(surface_); +} + +Surface::Surface(Surface&& other) noexcept : surface_(other.surface_) { + other.surface_ = nullptr; +} + +Surface& Surface::operator=(Surface&& other) noexcept { + if (&other == this) + return *this; + if (surface_ != nullptr) + SDL_FreeSurface(surface_); + surface_ = other.surface_; + other.surface_ = nullptr; + return *this; +} + +SDL_Surface* Surface::Get() const { + return surface_; +} + +} diff --git a/SDL2pp/Surface.hh b/SDL2pp/Surface.hh new file mode 100644 index 0000000..e02c0ab --- /dev/null +++ b/SDL2pp/Surface.hh @@ -0,0 +1,50 @@ +/* + libSDL2pp - C++11 bindings/wrapper for SDL2 + Copyright (C) 2014 Dmitry Marakasov + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. +*/ + +#ifndef SDL2PP_SURFACE_HH +#define SDL2PP_SURFACE_HH + +#include + +struct SDL_Surface; + +namespace SDL2pp { + +class Surface { +private: + SDL_Surface* surface_; + +public: + Surface(Uint32 flags, int width, int height, int depth, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask); + Surface(void* pixels, int width, int height, int depth, int pitch, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask); + virtual ~Surface(); + + Surface(const Surface& other) = delete; + Surface(Surface&& other) noexcept; + Surface& operator=(const Surface& other) = delete; + Surface& operator=(Surface&& other) noexcept; + + SDL_Surface* Get() const; +}; + +} + +#endif