mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-01-24 02:22:13 +08:00
58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
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);
|
|
}
|
|
|