Tue Jun 15 14:31:10 2010 UTC ()
Fix build with png-1.4.x. Addresses PR 43477.
(wiz)
diff -r1.13 -r1.14 pkgsrc/mail/spamprobe/distinfo
diff -r0 -r1.1 pkgsrc/mail/spamprobe/patches/patch-ab
--- pkgsrc/mail/spamprobe/distinfo 2010/06/02 13:17:22 1.13
+++ pkgsrc/mail/spamprobe/distinfo 2010/06/15 14:31:09 1.14
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.13 2010/06/02 13:17:22 adam Exp $ | | 1 | $NetBSD: distinfo,v 1.14 2010/06/15 14:31:09 wiz Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (spamprobe-1.4d.tar.gz) = fbcd65eb21097cd860d5e5ee2c4c2524c717a237 | | 3 | SHA1 (spamprobe-1.4d.tar.gz) = fbcd65eb21097cd860d5e5ee2c4c2524c717a237 |
| 4 | RMD160 (spamprobe-1.4d.tar.gz) = 4a9e098b92e6900d8b03d7ed5e8d052f2b2e8c56 | | 4 | RMD160 (spamprobe-1.4d.tar.gz) = 4a9e098b92e6900d8b03d7ed5e8d052f2b2e8c56 |
| 5 | Size (spamprobe-1.4d.tar.gz) = 262761 bytes | | 5 | Size (spamprobe-1.4d.tar.gz) = 262761 bytes |
| 6 | SHA1 (patch-aa) = 1a139882a9913537663a0d03b645e014b488ecbe | | 6 | SHA1 (patch-aa) = 1a139882a9913537663a0d03b645e014b488ecbe |
| | | 7 | SHA1 (patch-ab) = da2cd2cbc3b37e529e45b67eb7eea127afcaa07c |
$NetBSD: patch-ab,v 1.1 2010/06/15 14:31:10 wiz Exp $
--- src/parser/PngParser.cc.orig 2006-11-17 07:11:10.000000000 +0000
+++ src/parser/PngParser.cc
@@ -53,9 +53,9 @@ PngParser::~PngParser()
{
if (m_initialized) {
if (m_infoPtr) {
- png_destroy_read_struct(&m_pngPtr, &m_infoPtr, png_infopp_NULL);
+ png_destroy_read_struct(&m_pngPtr, &m_infoPtr, NULL);
} else {
- png_destroy_read_struct(&m_pngPtr, png_infopp_NULL, png_infopp_NULL);
+ png_destroy_read_struct(&m_pngPtr, NULL, NULL);
}
}
}
@@ -104,7 +104,7 @@ void PngParser::tokenizeImage()
int bit_depth, color_type, interlace_type;
png_get_IHDR(m_pngPtr, m_infoPtr, &width, &height, &bit_depth, &color_type,
- &interlace_type, int_p_NULL, int_p_NULL);
+ &interlace_type, NULL, NULL);
string base_token("image_0");
sendToken(base_token + "_height_" + num_to_string((int)width));