1 --- OpenSceneGraph-2.8.2/src/osgPlugins/png/ReaderWriterPNG.cpp~ 2008-07-14 00:18:59.000000000 +0200
2 +++ OpenSceneGraph-2.8.2/src/osgPlugins/png/ReaderWriterPNG.cpp 2010-03-01 12:57:05.720365671 +0100
4 endinfo = png_create_info_struct(png);
6 fin.read((char*)header,8);
7 - if (fin.gcount() == 8 && png_check_sig(header, 8))
8 + #if PNG_LIBPNG_VER < 10400
9 + if (fin.gcount() == 8 && png_check_sig(header, 8))
11 + if (fin.gcount() == 8 && png_sig_cmp(header, 0, 8))
13 png_set_read_fn(png,&fin,png_read_istream); //Use custom read function that will get data from istream
17 if (color == PNG_COLOR_TYPE_PALETTE)
18 png_set_palette_to_rgb(png);
19 if (color == PNG_COLOR_TYPE_GRAY && depth < 8)
20 - png_set_gray_1_2_4_to_8(png);
21 + #if PNG_LIBPNG_VER < 10400
22 + png_set_gray_1_2_4_to_8(png);
24 + png_set_expand_gray_1_2_4_to_8(png);
26 if (png_get_valid(png, info, PNG_INFO_tRNS))
27 png_set_tRNS_to_alpha(png);