Ticket #911 (new defect)

Opened 19 months ago

Last modified 17 months ago

png14 support

Reported by: skinkie Owned by: cinelerra@…
Priority: normal Milestone:
Component: Building Version: 2.1
Severity: blocker Keywords: png
Cc:

Description

Cinelerra doesn't compile with PNG14.

Change History

Changed 19 months ago by skinkie

Attaching doesn't work...

diff --git a/plugins/shapewipe/shapewipe.C b/plugins/shapewipe/shapewipe.C
index 2032aaa..fc8c737 100644
--- a/plugins/shapewipe/shapewipe.C
+++ b/plugins/shapewipe/shapewipe.C
@@ -386,7 +386,7 @@ int ShapeWipeMain::read_pattern_image(int new_frame_width, int new_frame_height)

}


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 @@ int ShapeWipeMain::read_pattern_image(int new_frame_width, int new_frame_height)

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;

}

Changed 17 months ago by DrGrege




Note: See TracTickets for help on using tickets.