[91298] trunk/dports/math/octave-image

[jmr at macports.org]

Revision: 91298
          https://trac.macports.org/changeset/91298
Author:   jmr at macports.org
Date:     2012-03-28 09:08:01 -0700 (Wed, 28 Mar 2012)
Log Message:
-----------
octave-image: fix build with libpng 1.4 (#29084)

Modified Paths:
--------------
    trunk/dports/math/octave-image/Portfile

Added Paths:
-----------
    trunk/dports/math/octave-image/files/
    trunk/dports/math/octave-image/files/png14.patch

Modified: trunk/dports/math/octave-image/Portfile
===================================================================
--- trunk/dports/math/octave-image/Portfile	2012-03-28 14:36:39 UTC (rev 91297)
+++ trunk/dports/math/octave-image/Portfile	2012-03-28 16:08:01 UTC (rev 91298)
@@ -19,3 +19,5 @@
 checksums           md5     c139877a4ce2b1f6fe08772a52a327be \
                     sha1    0d8731f8f47cc18fdfb2ead8e700d3507cff79df \
                     rmd160  3aad306325c84cfe543c7b61b60a7fea2cfa9c3c
+
+patchfiles          png14.patch

Added: trunk/dports/math/octave-image/files/png14.patch
===================================================================
--- trunk/dports/math/octave-image/files/png14.patch	                        (rev 0)
+++ trunk/dports/math/octave-image/files/png14.patch	2012-03-28 16:08:01 UTC (rev 91298)
@@ -0,0 +1,31 @@
+--- src/pngread.cc.orig	2009-06-07 20:45:04.000000000 +1000
++++ src/pngread.cc	2012-03-29 03:02:05.000000000 +1100
+@@ -207,7 +207,7 @@ canvas *load_canvas(char *filename)
+   /* Set error handling */
+   if (setjmp(png_jmpbuf(png_ptr))) {
+       error("pngread: libpng exited abnormally");
+-      png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++      png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
+       fclose(infile);
+       return NULL;
+   }
+@@ -229,7 +229,7 @@ canvas *load_canvas(char *filename)
+       png_set_palette_to_rgb(png_ptr);
+   }
+   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) {
+-      png_set_gray_1_2_4_to_8(png_ptr); // this function deprecated need to be redone
++      png_set_expand_gray_1_2_4_to_8(png_ptr);
+       bit_depth=8;
+       info_ptr->bit_depth=bit_depth;
+   }
+--- src/pngwrite.cc.orig	2009-06-07 20:45:04.000000000 +1000
++++ src/pngwrite.cc	2012-03-29 02:55:33.000000000 +1100
+@@ -126,7 +126,7 @@ void save_canvas(canvas *can,char *filen
+   if (!info_ptr) {
+       fclose(fp);
+       error("pngwrite: cannot not create image structure");
+-      png_destroy_write_struct(&png_ptr, png_infopp_NULL);
++      png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+       return;
+   }
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120328/4a559978/attachment.html>