[ocaml-camlimages] Import other files

[Bruno Wolff III]

commit 9860be4466b8576eabd8625f329338839b94b0dc
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Mon Mar 12 07:51:29 2012 -0500

    Import other files

 .gitignore                      |    1 +
 ocaml-camlimages-libpng15.patch |   58 +++++++++++++++++++++++++++++++++++++++
 sources                         |    2 +
 3 files changed, 61 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9a796d0..5e80094 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ camlimages-2.2.0-htmlref.tar.gz
 camlimages-2.2.0.tgz
 camlimages-3.0.1.tar.gz
 camlimages-3.0.2.tgz
+/v4.0.1.tar.gz
diff --git a/ocaml-camlimages-libpng15.patch b/ocaml-camlimages-libpng15.patch
new file mode 100644
index 0000000..d61bf6f
--- /dev/null
+++ b/ocaml-camlimages-libpng15.patch
@@ -0,0 +1,58 @@
+--- src/pngwrite.c.libpng	2011-06-22 13:04:32.000000000 -0500
++++ src/pngwrite.c	2012-01-29 13:58:34.231905872 -0600
+@@ -62,7 +62,7 @@
+   }
+ 
+   /* 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 @@
+   }
+ 
+   /* 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.libpng	2012-01-29 14:00:42.285180786 -0600
++++ src/pngread.c	2012-01-29 14:02:24.978232543 -0600
+@@ -69,7 +69,7 @@
+   }
+ 
+   /* 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 @@
+     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 @@
+   }
+ 
+   /* 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 @@
+     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);
diff --git a/sources b/sources
new file mode 100644
index 0000000..9264af6
--- /dev/null
+++ b/sources
@@ -0,0 +1,2 @@
+d6b9494b56a72b65fd302d1858efff7c  v4.0.1.tar.gz
+fb1633c9c8df0b2b2d0f892d8c4ac2ee  camlimages-2.2.0-htmlref.tar.gz