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
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
diff -Nur extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp
--- extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp 2007-09-01 19:38:12.000000000 +0300
+++ extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp 2010-01-25 03:47:21.000000000 +0200
@@ -53,7 +53,7 @@
if (!info_ptr)
{
png_destroy_read_struct(&png_ptr,
- (png_infopp)NULL, (png_infopp)NULL);
+ NULL, NULL);
fclose(fp);
return;
}
@@ -62,7 +62,7 @@
if (!end_info)
{
png_destroy_read_struct(&png_ptr, &info_ptr,
- (png_infopp)NULL);
+ NULL);
fclose(fp);
return;
}
@@ -77,7 +77,7 @@
png_get_IHDR(png_ptr, info_ptr, &width, &height,
- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
+ &bit_depth, &color_type, &interlace_type, NULL, NULL);
if(bit_depth == 16)
png_set_strip_16(png_ptr);
@@ -88,7 +88,7 @@
png_set_expand(png_ptr);
png_read_update_info(png_ptr, info_ptr);
png_get_IHDR(png_ptr, info_ptr, &width, &height,
- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
+ &bit_depth, &color_type, &interlace_type, NULL, NULL);
}
if( color_type == PNG_COLOR_TYPE_GRAY ||
@@ -96,7 +96,7 @@
png_set_gray_to_rgb(png_ptr);
png_read_update_info(png_ptr, info_ptr);
png_get_IHDR(png_ptr, info_ptr, &width, &height,
- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL);
+ &bit_depth, &color_type, &interlace_type, NULL, NULL);
}
this->width=width;
@@ -114,7 +114,7 @@
}
png_read_end(png_ptr, info_ptr);
- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
fclose(fp);
}
|
