diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-01-26 23:12:53 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-01-26 23:12:53 (GMT) |
| commit | e3ada8de4965ff07aee7b614c1dc4220dfb9933b (patch) | |
| tree | eb7aad4b5e9cbfda64e96fdb203b6b6603d0c1b4 /src/openscenegraph-4-png.patch | |
| parent | b652f30f1ff8396021881b1de9d0c3798126d3ea (diff) | |
| download | mxe-e3ada8de4965ff07aee7b614c1dc4220dfb9933b.zip mxe-e3ada8de4965ff07aee7b614c1dc4220dfb9933b.tar.gz mxe-e3ada8de4965ff07aee7b614c1dc4220dfb9933b.tar.bz2 | |
improvements for package openscenegraph (by Martin Lambers)
* Add -DOSG_LIBRARY_STATIC to openscenegraph-osg.pc Cflags
* Update the documentation
* Update the openscenegraph-2-static.patch to a more general version
that is now submitted to upstream
* Add openscenegraph-4-png.patch from upstream SVN which fixes
compilation with libpng-1.4. Remove openscenegraph-4-disable-png.patch
and reenable the PNG plugin.
Diffstat (limited to 'src/openscenegraph-4-png.patch')
| -rw-r--r-- | src/openscenegraph-4-png.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/src/openscenegraph-4-png.patch b/src/openscenegraph-4-png.patch new file mode 100644 index 0000000..1aa6f65 --- /dev/null +++ b/src/openscenegraph-4-png.patch @@ -0,0 +1,19 @@ +This file is part of mingw-cross-env. +See doc/index.html or doc/README for further information. + +--- OpenSceneGraph-2.8.2.orig/src/osgPlugins/png/ReaderWriterPNG.cpp ++++ OpenSceneGraph-2.8.2/src/osgPlugins/png/ReaderWriterPNG.cpp +@@ -179,5 +179,5 @@ + + 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 +@@ -230,5 +230,5 @@ + 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); |