lauchmelder/SFML
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgraded external libraries (libpng 1.4.1, zlib 1.2.4, openal-soft 1.12.854) on Windows

Browse source 
git-svn-id: https://sfml.svn.sourceforge.net/svnroot/sfml/branches/sfml2@1496 4e206d99-4929-0410-ac5d-dfc041789085
This commit is contained in:
LaurentGom 2010-04-07 07:57:32 +00:00
parent 14d0b8a483
commit a6b9dbfd39
14 changed files with 3389 additions and 3667 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/SFML/Graphics/ImageLoader.cpp
View file

@ -35,6 +35,10 @@ extern "C"
#include <png.h>
#include <SOIL/SOIL.h>
// For compatibility with versions of libpng < 1.4.0
#ifndef png_jmpbuf
#define png_jmpbuf(png) png->jmpbuf
#endif
namespace
{
@ -44,7 +48,7 @@ namespace
void PngErrorHandler(png_structp png, png_const_charp message)
{
sf::Err() << "Failed to write PNG image. Reason : " << message << std::endl;
longjmp(png->jmpbuf, 1);
longjmp(png_jmpbuf(png), 1);
}
}
@ -288,7 +292,7 @@ bool ImageLoader::WritePng(const std::string& filename, const std::vector<Uint8>
}
// For proper error handling...
if (setjmp(png->jmpbuf))
if (setjmp(png_jmpbuf(png)))
{
png_destroy_write_struct(&png, &pngInfos);
return false;