Author: ankry                        Date: Tue Feb 16 15:20:40 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed build with new libpng

---- Files affected:
packages/gnofract4d:
   gnofract4d-libpng.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnofract4d/gnofract4d-libpng.patch
diff -u /dev/null packages/gnofract4d/gnofract4d-libpng.patch:1.1
--- /dev/null   Tue Feb 16 16:20:40 2010
+++ packages/gnofract4d/gnofract4d-libpng.patch Tue Feb 16 16:20:35 2010
@@ -0,0 +1,47 @@
+--- gnofract4d-3.11/fract4d/c/imageIO.cpp~     2007-07-04 05:50:02.000000000 
+0200
++++ gnofract4d-3.11/fract4d/c/imageIO.cpp      2010-02-16 16:16:44.744627806 
+0100
+@@ -119,7 +119,7 @@
+       info_ptr = png_create_info_struct(png_ptr);
+       if(NULL == info_ptr)
+       {
+-          png_destroy_write_struct(&png_ptr, png_infopp_NULL);
++          png_destroy_write_struct(&png_ptr, NULL);
+           return;
+       }
+ 
+@@ -312,7 +312,7 @@
+       info_ptr = png_create_info_struct(png_ptr);
+       if (info_ptr == NULL)
+       {
+-          png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++          png_destroy_read_struct(&png_ptr, NULL, NULL);
+           return;
+       }
+ 
+@@ -325,7 +325,7 @@
+       //printf("shutdown\n");
+       if(ok)
+       {
+-          png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++          png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+       }
+     }
+ 
+@@ -351,7 +351,7 @@
+     
+     //printf("get IHDR\n");
+     png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
+-               &interlace_type, int_p_NULL, int_p_NULL);
++               &interlace_type, NULL, NULL);
+ 
+     //printf("set res(%d,%d)\n",width,height);
+     if(!im->set_resolution(width, height, -1, -1))
+@@ -372,7 +372,7 @@
+       for (int y = 0; y < im->Yres(); y++)
+       {
+           png_bytep row = (png_bytep)(im->getBuffer() + im->row_length() * 
y); 
+-          png_read_rows(png_ptr, &row, png_bytepp_NULL, 1);
++          png_read_rows(png_ptr, &row, NULL, 1);
+       }
+     }
+     return true;
================================================================
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to