[scorched3d] Access png struct elements through accessors

[Bruno Wolff III]

commit 59cb00187c536afe7cb48721c6db7955553fa25e
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Nov 6 09:53:52 2011 -0600

    Access png struct elements through accessors

 scorched3d-libpng15.patch |   11 +++++++++++
 scorched3d.spec           |    3 +++
 2 files changed, 14 insertions(+), 0 deletions(-)
---
diff --git a/scorched3d-libpng15.patch b/scorched3d-libpng15.patch
new file mode 100644
index 0000000..3b3c5b2
--- /dev/null
+++ b/scorched3d-libpng15.patch
@@ -0,0 +1,11 @@
+--- src/common/image/ImagePngFactory.cpp.libpng	2011-11-06 09:48:54.631066973 -0600
++++ src/common/image/ImagePngFactory.cpp	2011-11-06 09:51:06.381811813 -0600
+@@ -104,7 +104,7 @@
+ 
+ static void user_png_error(png_structp png_ptr, png_const_charp msg) 
+ {
+-	longjmp(png_ptr->jmpbuf,1);
++	longjmp(png_jmpbuf(png_ptr),1);
+ }
+ 
+ static void user_png_warning(png_structp png_ptr, png_const_charp msg) 
diff --git a/scorched3d.spec b/scorched3d.spec
index 4b803d9..e126447 100644
--- a/scorched3d.spec
+++ b/scorched3d.spec
@@ -22,6 +22,7 @@ Source1:        %{name}.desktop
 Source2:        openal-config
 Patch1:         %{name}-syslibs.patch
 Patch2:         %{name}-help.patch
+Patch3:         %{name}-libpng15.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  wxGTK-devel SDL_net-devel libGLU-devel
 BuildRequires:  expat-devel libvorbis-devel glew-devel fftw-devel libjpeg-devel
@@ -52,6 +53,7 @@ conditions and terrains to be dealt with.
 rm `find . -name Makefile`
 %patch1 -p0 -z .syslibs
 %patch2 -p1 -z .help
+%patch3 -z .libpng
 install -m 755 %{SOURCE2} .
 # stop autoxxx from running
 touch aclocal.m4
@@ -121,6 +123,7 @@ fi
 %changelog
 * Sun Nov 06 2011 Bruno Wolff III <bruno at wolff.to> - 43.2a-3
 - Rebuild for libpng 1.5
+- Make sure all direct png struct references are through accessors
 
 * Tue Jun 21 2011 Bruno Wolff III <bruno at wolff.to> - 43.2a-2
 - Extract a 48x48 png to use as the icon