mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

Properly support png 1.5

Browse Source 
Obtained from:	Gentoo
This commit is contained in:
Baptiste Daroussin 2014-12-24 12:29:30 +00:00
parent b6756efc94
commit bf7c3af700
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=375450
4 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/libafterimage/Makefile
View File

@ -15,7 +15,7 @@ LICENSE= LGPL21
LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib \
libjpeg.so:${PORTSDIR}/graphics/jpeg \
libpng15.so:${PORTSDIR}/graphics/png \
libpng.so:${PORTSDIR}/graphics/png \
libtiff.so:${PORTSDIR}/graphics/tiff \
libfreetype.so:${PORTSDIR}/print/freetype2

11
graphics/libafterimage/files/patch-export.c
View File

@ -1,11 +0,0 @@
--- export.c.orig 2011-01-15 06:52:22.000000000 +0100
+++ export.c 2012-05-04 12:57:15.000000000 +0200
@@ -496,7 +496,7 @@
png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
if ( png_ptr != NULL )
if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
- if( setjmp(png_ptr->jmpbuf) )
+ if( setjmp(png_jmpbuf(png_ptr)) )
{
png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
info_ptr = NULL ;

19
graphics/libafterimage/files/patch-import.c
View File

@ -1,19 +0,0 @@
--- import.c.orig 2011-01-15 06:52:22.000000000 +0100
+++ import.c 2012-05-04 18:57:46.000000000 +0200
@@ -40,6 +40,7 @@
# else
# include <png.h>
# endif
+# include <pngpriv.h>
#else
# include <setjmp.h>
# ifdef HAVE_JPEG
@@ -1251,7 +1252,7 @@
* the normal method of doing things with libpng). REQUIRED unless you
* set up your own error handlers in the png_create_read_struct() earlier.
*/
- if ( !setjmp (png_ptr->jmpbuf))
+ if ( !setjmp (png_jmpbuf(png_ptr)))
{
ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;

31
graphics/libafterimage/files/patch-libpng15 Normal file
View File

@ -0,0 +1,31 @@
--- export.c
+++ export.c
@@ -496,7 +496,7 @@
png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
if ( png_ptr != NULL )
if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
- if( setjmp(png_ptr->jmpbuf) )
+ if( setjmp(png_jmpbuf(png_ptr)) )
{
png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
info_ptr = NULL ;
--- import.c
+++ import.c
@@ -1251,7 +1251,7 @@
* the normal method of doing things with libpng). REQUIRED unless you
* set up your own error handlers in the png_create_read_struct() earlier.
*/
- if ( !setjmp (png_ptr->jmpbuf))
+ if ( !setjmp (png_jmpbuf(png_ptr)))
{
ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
@@ -1468,7 +1468,7 @@
static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
{
- ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr;
+ ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr);
memcpy(data, buf->buffer, length);
buf->buffer += length;
}