0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Throw when creating a surface with negative dimensions, small cleanup

Browse source 
There isn't a palette attached to that format as far as I can tell.
This commit is contained in:
Charles Dang 2019-07-31 19:11:49 +11:00
parent 9c1d69254d
commit ef47599d96
1 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/sdl/surface.cpp
View file

@ -16,23 +16,12 @@
#include "sdl/rect.hpp"
#include "video.hpp"
#include <iostream>
const SDL_PixelFormat surface::neutral_pixel_format = []() {
SDL_PixelFormat format;
#if SDL_VERSION_ATLEAST(2, 0, 6)
SDL_Surface* surf =
SDL_CreateRGBSurfaceWithFormat(0, 1, 1, 32, SDL_PIXELFORMAT_ARGB8888);
return *SDL_CreateRGBSurfaceWithFormat(0, 1, 1, 32, SDL_PIXELFORMAT_ARGB8888)->format;
#else
SDL_Surface* surf =
SDL_CreateRGBSurface(0, 1, 1, 32, SDL_RED_MASK, SDL_GREEN_MASK, SDL_BLUE_MASK, SDL_ALPHA_MASK);
return *SDL_CreateRGBSurface(0, 1, 1, 32, SDL_RED_MASK, SDL_GREEN_MASK, SDL_BLUE_MASK, SDL_ALPHA_MASK)->format;
#endif
format = *surf->format;
format.palette = nullptr;
return format;
}();
surface::surface(SDL_Surface* surf)
@ -45,8 +34,7 @@ surface::surface(int w, int h)
: surface_(nullptr)
{
if (w < 0 || h < 0) {
std::cerr << "error: creating surface with negative dimensions\n";
return;
throw std::invalid_argument("Creating surface with negative dimensions");
}
#if SDL_VERSION_ATLEAST(2, 0, 6)