Ancurio
/
mkxp-freebird
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Raise exception on invalid bitmap sizes 

A difference to RMXP is that negative height values
will result in exceptions too.
Also change Bitmap constructors to not allocate Private
struct before potential exceptions.
This commit is contained in:
Jonas Kulla 2013-09-04 18:11:16 +02:00
parent 6a85699e11
commit efa55ce6c2
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bitmap.cpp
View File

@ -139,11 +139,14 @@ Bitmap::Bitmap(const char *filename)
if (!imgSurf) if (!imgSurf)
throw Exception(Exception::SDLError, "SDL: %s", SDL_GetError()); throw Exception(Exception::SDLError, "SDL: %s", SDL_GetError());
p = new BitmapPrivate; TexFBO tex;
p->ensureFormat(imgSurf, SDL_PIXELFORMAT_ABGR8888); p->ensureFormat(imgSurf, SDL_PIXELFORMAT_ABGR8888);
p->tex = gState->texPool().request(imgSurf->w, imgSurf->h); tex = gState->texPool().request(imgSurf->w, imgSurf->h);
p = new BitmapPrivate;
p->tex = tex;
Tex::bind(p->tex.tex); Tex::bind(p->tex.tex);
Tex::uploadImage(p->tex.width, p->tex.height, imgSurf->pixels, GL_RGBA); Tex::uploadImage(p->tex.width, p->tex.height, imgSurf->pixels, GL_RGBA);
@ -153,9 +156,13 @@ Bitmap::Bitmap(const char *filename)
Bitmap::Bitmap(int width, int height) Bitmap::Bitmap(int width, int height)
{ {
p = new BitmapPrivate; if (width <= 0 || height <= 0)
throw Exception(Exception::RGSSError, "failed to create bitmap");
p->tex = gState->texPool().request(width, height); TexFBO tex = gState->texPool().request(width, height);
p = new BitmapPrivate;
p->tex = tex;
clear(); clear();
} }