FGFS-4.1/OpenSceneGraph
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Jean-Sebastien Guay, build fixes for Mingw

Browse Source
This commit is contained in:
Robert Osfield
2010-01-18 14:27:20 +00:00
parent 613606dc7e
commit 2a6719b7d8
6 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osgPlugins/png/ReaderWriterPNG.cpp
View File

@@ -178,7 +178,7 @@ class ReaderWriterPNG : public osgDB::ReaderWriter
endinfo = png_create_info_struct(png);
fin.read((char*)header,8);
if (fin.gcount() == 8 && png_check_sig(header, 8))
if (fin.gcount() == 8 && png_sig_cmp(header, 0, 8) == 0)
png_set_read_fn(png,&fin,png_read_istream); //Use custom read function that will get data from istream
else
{
@@ -229,7 +229,7 @@ class ReaderWriterPNG : public osgDB::ReaderWriter
if (color == PNG_COLOR_TYPE_PALETTE)
png_set_palette_to_rgb(png);
if (color == PNG_COLOR_TYPE_GRAY && depth < 8)
png_set_gray_1_2_4_to_8(png);
png_set_expand_gray_1_2_4_to_8(png);
if (png_get_valid(png, info, PNG_INFO_tRNS))
png_set_tRNS_to_alpha(png);