mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-25 12:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when creating an empty sf::Image

Browse Source
This commit is contained in:
Laurent Gomila 2012-05-10 22:48:02 +02:00
parent 5207930169
commit ac43578f75
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/SFML/Graphics/Image.cpp
View File

@ -45,6 +45,8 @@ m_size(0, 0)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void Image::create(unsigned int width, unsigned int height, const Color& color) void Image::create(unsigned int width, unsigned int height, const Color& color)
{ {
if (width && height)
{
// Assign the new size // Assign the new size
m_size.x = width; m_size.x = width;
m_size.y = height; m_size.y = height;
@ -62,13 +64,21 @@ void Image::create(unsigned int width, unsigned int height, const Color& color)
*ptr++ = color.b; *ptr++ = color.b;
*ptr++ = color.a; *ptr++ = color.a;
} }
}
else
{
// Create an empty image
m_size.x = 0;
m_size.y = 0;
m_pixels.clear();
}
} }
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
void Image::create(unsigned int width, unsigned int height, const Uint8* pixels) void Image::create(unsigned int width, unsigned int height, const Uint8* pixels)
{ {
if (pixels) if (pixels && width && height)
{ {
// Assign the new size // Assign the new size
m_size.x = width; m_size.x = width;