mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Properly support png 1.5

Browse Source
This commit is contained in:
Baptiste Daroussin 2014-12-25 10:49:46 +00:00
parent a2399f30d5
commit ce1be232cf
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=375530
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lang/ofc/Makefile
View File

@ -11,7 +11,7 @@ MAINTAINER= vanilla@FreeBSD.org
COMMENT= The Objective-C Foundation Classes library
LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \
libpng15.so:${PORTSDIR}/graphics/png \
libpng.so:${PORTSDIR}/graphics/png \
libjpeg.so:${PORTSDIR}/graphics/jpeg \
libfreetype.so:${PORTSDIR}/print/freetype2

29
lang/ofc/files/patch-DPNGImage.m → lang/ofc/files/patch-ofc_DPNGImage.m
View File

@ -1,14 +1,6 @@
--- ofc/DPNGImage.m.orig 2008-08-20 19:16:29.000000000 +0200
+++ ofc/DPNGImage.m 2012-05-09 13:07:56.000000000 +0200
@@ -30,6 +30,7 @@
#ifdef HAVE_DPNGIMAGE
#include "png.h"
+#include "pngpriv.h"
#endif
@@ -346,7 +347,7 @@
--- ofc/DPNGImage.m.orig 2008-08-20 17:16:29 UTC
+++ ofc/DPNGImage.m
@@ -346,7 +346,7 @@ static void _warning(png_structp png, pn
if (ok)
{
@ -17,7 +9,16 @@
{
WARNING(DW_UNKNOWN_WARNING, "Error reading PNG file");
ok = NO;
@@ -485,7 +486,7 @@
@@ -406,7 +406,7 @@ static void _warning(png_structp png, pn
_width = (unsigned) width;
_height = (unsigned) height;
- _bpp = info->channels;
+ _bpp = png_get_channels(png, info);
_images = 1;
_reading = YES;
@@ -485,7 +485,7 @@ static void _warning(png_structp png, pn
if (ok)
{
@ -26,7 +27,7 @@
{
WARNING(DW_UNKNOWN_WARNING, "Error writing PNG file");
ok = NO;
@@ -553,7 +554,7 @@
@@ -553,7 +553,7 @@ static void _warning(png_structp png, pn
pixels = _width;
@ -35,7 +36,7 @@
{
WARNING(DW_UNKNOWN_WARNING, "Error reading PNG file");
pixels = 0;
@@ -599,7 +600,7 @@
@@ -599,7 +599,7 @@ static void _warning(png_structp png, pn
png_structp png = (png_structp) _png;