diff options
Diffstat (limited to 'games/Scorched3D/scorched3d-43.1c-libpng14.patch')
| -rw-r--r-- | games/Scorched3D/scorched3d-43.1c-libpng14.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/games/Scorched3D/scorched3d-43.1c-libpng14.patch b/games/Scorched3D/scorched3d-43.1c-libpng14.patch new file mode 100644 index 0000000000..d61a2b6ac4 --- /dev/null +++ b/games/Scorched3D/scorched3d-43.1c-libpng14.patch @@ -0,0 +1,40 @@ +http://bugs.gentoo.org/show_bug.cgi?id=308867 + +--- src/common/image/ImagePng.cpp ++++ src/common/image/ImagePng.cpp +@@ -189,7 +189,7 @@ bool ImagePng::loadFromBuffer(NetBuffer + info_ptr = png_create_info_struct(png_ptr);
+ if (info_ptr == NULL)
+ {
+- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return false;
+ }
+
+@@ -200,7 +200,7 @@ bool ImagePng::loadFromBuffer(NetBuffer + if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ /* If we get here, we had a problem reading the file */
+ return false;
+ }
+@@ -258,7 +258,7 @@ bool ImagePng::loadFromBuffer(NetBuffer + }
+ else
+ {
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+
+ Logger::log(S3D::formatStringBuffer(
+ "Invalid PNG format.\n"
+@@ -272,7 +272,7 @@ bool ImagePng::loadFromBuffer(NetBuffer + // END NEW CODE
+
+ /* clean up after the read, and free any memory allocated - REQUIRED */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+
+ /* that's it */
+ return true;
|