summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/cinelerra/files/cinelerra-20100320-libpng14.patch')
-rw-r--r--media-video/cinelerra/files/cinelerra-20100320-libpng14.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/media-video/cinelerra/files/cinelerra-20100320-libpng14.patch b/media-video/cinelerra/files/cinelerra-20100320-libpng14.patch
new file mode 100644
index 000000000000..f3a0b854f741
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-20100320-libpng14.patch
@@ -0,0 +1,41 @@
+http://repos.archlinux.org/wsvn/community/cinelerra-cv/trunk/libpng14.patch
+
+--- cinelerra/cinelerra/filepng.C
++++ cinelerra/cinelerra/filepng.C
+@@ -56,7 +56,7 @@
+ fread(test, 16, 1, stream);
+ fclose(stream);
+
+- if(png_check_sig((unsigned char*)test, 8))
++ if(png_sig_cmp((unsigned char*)test, 0, 8) == 0)
+ {
+ //printf("FilePNG::check_sig 1\n");
+ return 1;
+--- cinelerra/plugins/shapewipe/shapewipe.C
++++ cinelerra/plugins/shapewipe/shapewipe.C
+@@ -386,7 +386,7 @@
+ }
+
+ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+- png_voidp_NULL, png_error_ptr_NULL, png_error_ptr_NULL);
++ NULL, NULL, NULL);
+
+ if (!png_ptr)
+ {
+@@ -399,14 +399,14 @@
+ info_ptr = png_create_info_struct(png_ptr);
+ if (!info_ptr)
+ {
+- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return 1;
+ }
+
+ end_info = png_create_info_struct(png_ptr);
+ if (!end_info)
+ {
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ return 1;
+ }
+