1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
$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));
|
