[coot] * Sat Dec 10 2011 Tim Fenn <tim.fenn at gmail.com> - 0.6.2-10.20110715svn3566 - patch for new libpng

[Timothy Fenn]

commit 8cde1f0ae9ccefb2473edd6c1bb0f1dfda38fd26
Author: Tim Fenn <fenn at stanford.edu>
Date:   Sat Dec 10 17:10:37 2011 -0800

    * Sat Dec 10 2011 Tim Fenn <tim.fenn at gmail.com> - 0.6.2-10.20110715svn3566
    - patch for new libpng

 coot-libpng15.patch |   29 +++++++++++++++++++++++++++++
 coot.spec           |    7 ++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/coot-libpng15.patch b/coot-libpng15.patch
new file mode 100644
index 0000000..bddd251
--- /dev/null
+++ b/coot-libpng15.patch
@@ -0,0 +1,29 @@
+--- ccp4mg-utils/ppmutil.cc
++++ ccp4mg-utils/ppmutil.cc
+@@ -2494,15 +2494,21 @@
+ 
+   pixels = new unsigned char[width*height*colourspace];
+ 
++  png_colorp palette;
++  int num_trans;
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >=4
++  png_bytep trans_alpha;
++#endif
++
+   for (int i=0; i<height; i++){
+     if(color_type==PNG_COLOR_TYPE_PALETTE){
+       for (int j=0; j<width; j++){
+-        pixels[i*width*colourspace+j*colourspace] = png_ptr->palette[row_pointers[i][j]].red;
+-        pixels[i*width*colourspace+j*colourspace+1] = png_ptr->palette[row_pointers[i][j]].green;
+-        pixels[i*width*colourspace+j*colourspace+2] = png_ptr->palette[row_pointers[i][j]].blue;
+-        if(row_pointers[i][j]<png_ptr->num_trans){
++        pixels[i*width*colourspace+j*colourspace] = palette[row_pointers[i][j]].red;
++        pixels[i*width*colourspace+j*colourspace+1] = palette[row_pointers[i][j]].green;
++        pixels[i*width*colourspace+j*colourspace+2] = palette[row_pointers[i][j]].blue;
++        if(row_pointers[i][j]<num_trans){
+ #if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >=4
+-         pixels[i*width*colourspace+j*colourspace+3] = png_ptr->trans_alpha[row_pointers[i][j]];
++         pixels[i*width*colourspace+j*colourspace+3] = trans_alpha[row_pointers[i][j]];
+ #else
+          pixels[i*width*colourspace+j*colourspace+3] = png_ptr->trans[row_pointers[i][j]];
+ #endif
diff --git a/coot.spec b/coot.spec
index bd23c23..7741dec 100644
--- a/coot.spec
+++ b/coot.spec
@@ -5,7 +5,7 @@ Name: coot
 Summary: The crystallographic object-oriented toolkit
 URL: http://www.biop.ox.ac.uk/coot/
 Version: 0.6.2
-Release: 9.20110715svn3566%{?dist}
+Release: 10.20110715svn3566%{?dist}
 # source code is mixed GPLv3+ and LGPLv2+ (see %files for breakdown)
 License: GPLv3+ and LGPLv2+
 Group: Applications/Engineering
@@ -22,6 +22,7 @@ Source5: %{name}.desktop
 Source6: __init__.py
 Patch0: coot-configure.in.patch
 Patch1: coot-user-manual.texi.patch
+Patch2: coot-libpng15.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: clipper-devel >= 2.1-7
@@ -84,6 +85,7 @@ package.
 %setup -q -a 1
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
 
 cp %{SOURCE2} ./src/
 cp %{SOURCE3} ./src/
@@ -173,6 +175,9 @@ make check
 %doc doc/coot-keys-and-buttons.pdf doc/user-manual.pdf
 
 %changelog
+* Sat Dec 10 2011 Tim Fenn <tim.fenn at gmail.com> - 0.6.2-10.20110715svn3566
+- patch for new libpng
+
 * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 0.6.2-9.20110715svn3566
 - Rebuild for new libpng