[98807] trunk/dports/devel/camlimages

[jmr at macports.org]

Revision: 98807
          http://trac.macports.org//changeset/98807
Author:   jmr at macports.org
Date:     2012-10-16 22:59:56 -0700 (Tue, 16 Oct 2012)
Log Message:
-----------
camlimages: more libpng 1.5 fixes (#35952)

Modified Paths:
--------------
    trunk/dports/devel/camlimages/Portfile

Added Paths:
-----------
    trunk/dports/devel/camlimages/files/patch-png.diff

Removed Paths:
-------------
    trunk/dports/devel/camlimages/files/patch-pngwrite.c.diff

Modified: trunk/dports/devel/camlimages/Portfile
===================================================================
--- trunk/dports/devel/camlimages/Portfile	2012-10-17 05:51:13 UTC (rev 98806)
+++ trunk/dports/devel/camlimages/Portfile	2012-10-17 05:59:56 UTC (rev 98807)
@@ -15,7 +15,7 @@
 				to render TrueType fonts.
 homepage			http://gallium.inria.fr/camlimages/
 
-patchfiles			patch-src-jpegread.c.diff patch-pngwrite.c.diff
+patchfiles			patch-src-jpegread.c.diff patch-png.diff
 
 platforms			darwin
 

Copied: trunk/dports/devel/camlimages/files/patch-png.diff (from rev 98806, trunk/dports/devel/camlimages/files/patch-pngwrite.c.diff)
===================================================================
--- trunk/dports/devel/camlimages/files/patch-png.diff	                        (rev 0)
+++ trunk/dports/devel/camlimages/files/patch-png.diff	2012-10-17 05:59:56 UTC (rev 98807)
@@ -0,0 +1,58 @@
+--- src/pngwrite.c.orig	2011-06-23 04:04:32.000000000 +1000
++++ src/pngwrite.c	2012-10-17 16:39:41.000000000 +1100
+@@ -62,7 +62,7 @@ value write_png_file_rgb( name, buffer, 
+   }
+ 
+   /* error handling */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     /* Free all of the memory associated with the png_ptr and info_ptr */
+     png_destroy_write_struct(&png_ptr, &info_ptr);
+     fclose(fp);
+@@ -171,7 +171,7 @@ value write_png_file_index( name, buffer
+   }
+ 
+   /* error handling */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  if (setjmp(png_jmpbuf(png_ptr))) {
+     /* Free all of the memory associated with the png_ptr and info_ptr */
+     png_destroy_write_struct(&png_ptr, &info_ptr);
+     fclose(fp);
+--- src/pngread.c.orig	2011-06-23 04:04:32.000000000 +1000
++++ src/pngread.c	2012-10-17 16:57:52.000000000 +1100
+@@ -69,7 +69,7 @@ value read_png_file_as_rgb24( name )
+   }
+ 
+   /* error handling */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  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);
+     fclose(fp);
+@@ -134,7 +134,7 @@ value read_png_file_as_rgb24( name )
+     png_set_rows(png_ptr, info_ptr, row_pointers);
+ 
+     /* Later, we can return something */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    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);
+       fclose(fp);
+@@ -243,7 +243,7 @@ value read_png_file( name )
+   }
+ 
+   /* error handling */
+-  if (setjmp(png_ptr->jmpbuf)) {
++  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);
+     fclose(fp);
+@@ -302,7 +302,7 @@ value read_png_file( name )
+     png_set_rows(png_ptr, info_ptr, row_pointers);
+ 
+     /* Later, we can return something */
+-    if (setjmp(png_ptr->jmpbuf)) {
++    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);
+       fclose(fp);

Deleted: trunk/dports/devel/camlimages/files/patch-pngwrite.c.diff
===================================================================
--- trunk/dports/devel/camlimages/files/patch-pngwrite.c.diff	2012-10-17 05:51:13 UTC (rev 98806)
+++ trunk/dports/devel/camlimages/files/patch-pngwrite.c.diff	2012-10-17 05:59:56 UTC (rev 98807)
@@ -1,20 +0,0 @@
---- src/pngwrite.c.orig	2011-06-23 04:04:32.000000000 +1000
-+++ src/pngwrite.c	2012-10-17 16:39:41.000000000 +1100
-@@ -62,7 +62,7 @@ value write_png_file_rgb( name, buffer, 
-   }
- 
-   /* error handling */
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     /* Free all of the memory associated with the png_ptr and info_ptr */
-     png_destroy_write_struct(&png_ptr, &info_ptr);
-     fclose(fp);
-@@ -171,7 +171,7 @@ value write_png_file_index( name, buffer
-   }
- 
-   /* error handling */
--  if (setjmp(png_ptr->jmpbuf)) {
-+  if (setjmp(png_jmpbuf(png_ptr))) {
-     /* Free all of the memory associated with the png_ptr and info_ptr */
-     png_destroy_write_struct(&png_ptr, &info_ptr);
-     fclose(fp);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121016/bf1d9867/attachment.html>