LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-21 21:15:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Error if the ImageData given to love.window.setIcon is not a 32 bit RGBA format.

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2017-11-26 18:31:43 -04:00
parent 82553d793d
commit b6cb6aed47
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/window/sdl/Window.cpp
+6 -2
View File
@@ -842,6 +842,9 @@ bool Window::setIcon(love::image::ImageData *imgd)
if (!imgd)
return false;
if (imgd->getFormat() != PIXELFORMAT_RGBA8)
throw love::Exception("setIcon only accepts 32-bit RGBA images.");
icon.set(imgd);
if (!window)
@@ -862,14 +865,15 @@ bool Window::setIcon(love::image::ImageData *imgd)
int w = imgd->getWidth();
int h = imgd->getHeight();
int pitch = imgd->getWidth() * 4;
int bytesperpixel = (int) getPixelFormatSize(imgd->getFormat());
int pitch = w * bytesperpixel;
SDL_Surface *sdlicon = nullptr;
{
// We don't want another thread modifying the ImageData mid-copy.
love::thread::Lock lock(imgd->getMutex());
sdlicon = SDL_CreateRGBSurfaceFrom(imgd->getData(), w, h, 32, pitch, rmask, gmask, bmask, amask);
sdlicon = SDL_CreateRGBSurfaceFrom(imgd->getData(), w, h, bytesperpixel * 8, pitch, rmask, gmask, bmask, amask);
}
if (!sdlicon)
src/modules/window/wrap_Window.cpp
+3 -1
View File
@@ -365,7 +365,9 @@ int w_getPosition(lua_State *L)
int w_setIcon(lua_State *L)
{
image::ImageData *i = luax_checktype<image::ImageData>(L, 1);
luax_pushboolean(L, instance()->setIcon(i));
bool success = false;
luax_catchexcept(L, [&]() { success = instance()->setIcon(i); });
luax_pushboolean(L, success);
return 1;
}