1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
|
diff -rupN lux-orig/core/external/cimg.h lux-fixed/external/core/cimg.h
--- lux-orig/core/external/cimg.h 2010-07-07 14:50:00.000000000 +0100
+++ lux-fixed/core/external/cimg.h 2010-07-07 14:50:00.000000000 +0100
@@ -25679,7 +25679,7 @@ namespace cimg_library {
png_read_info(png_ptr,info_ptr);
png_uint_32 W, H;
int bit_depth, color_type, interlace_type;
- png_get_IHDR(png_ptr,info_ptr,&W,&H,&bit_depth,&color_type,&interlace_type,int_p_NULL,int_p_NULL);
+ png_get_IHDR(png_ptr,info_ptr,&W,&H,&bit_depth,&color_type,&interlace_type,(int *) NULL,(int *) NULL);
int new_bit_depth = bit_depth;
int new_color_type = color_type;
@@ -25690,7 +25690,7 @@ namespace cimg_library {
new_bit_depth = 8;
}
if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){
- png_set_gray_1_2_4_to_8(png_ptr);
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
new_bit_depth = 8;
}
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
|
GitWeb
