* 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.pull/13/head
parent
b652f30f1f
commit
e3ada8de49
@ -1,18 +1,11 @@
|
||||
This file is part of mingw-cross-env.
|
||||
See doc/index.html or doc/README for further information.
|
||||
|
||||
diff -uNr OpenSceneGraph-2.8.2.orig/src/osgPlugins/exr/ReaderWriterEXR.cpp OpenSceneGraph-2.8.2/src/osgPlugins/exr/ReaderWriterEXR.cpp
|
||||
--- OpenSceneGraph-2.8.2.orig/src/osgPlugins/exr/ReaderWriterEXR.cpp 2008-11-27 10:36:18.000000000 +0100
|
||||
+++ OpenSceneGraph-2.8.2/src/osgPlugins/exr/ReaderWriterEXR.cpp 2010-01-14 17:55:32.000000000 +0100
|
||||
@@ -4,11 +4,6 @@
|
||||
+++ OpenSceneGraph-2.8.2/src/osgPlugins/exr/ReaderWriterEXR.cpp 2010-01-26 21:36:31.000000000 +0100
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <osg/Image>
|
||||
#include <osg/GL>
|
||||
|
||||
-#ifdef _WIN32
|
||||
-//Make the half format work against openEXR libs
|
||||
-#define OPENEXR_DLL
|
||||
-#endif
|
||||
-
|
||||
#include <osgDB/Registry>
|
||||
#include <osgDB/FileNameUtils>
|
||||
#include <osgDB/FileUtils>
|
||||
+#if defined _WIN32 && !defined OSG_LIBRARY_STATIC
|
||||
//Make the half format work against openEXR libs
|
||||
#define OPENEXR_DLL
|
||||
#endif
|
||||
|
@ -1,16 +0,0 @@
|
||||
This file is part of mingw-cross-env.
|
||||
See doc/index.html or doc/README for further information.
|
||||
|
||||
diff -uNr OpenSceneGraph-2.8.2.orig/src/osgPlugins/CMakeLists.txt OpenSceneGraph-2.8.2/src/osgPlugins/CMakeLists.txt
|
||||
--- OpenSceneGraph-2.8.2.orig/src/osgPlugins/CMakeLists.txt 2009-01-14 21:32:06.000000000 +0100
|
||||
+++ OpenSceneGraph-2.8.2/src/osgPlugins/CMakeLists.txt 2010-01-15 06:54:16.000000000 +0100
|
||||
@@ -96,9 +96,6 @@
|
||||
IF(GIFLIB_FOUND)
|
||||
ADD_SUBDIRECTORY(gif)
|
||||
ENDIF(GIFLIB_FOUND)
|
||||
-IF(PNG_FOUND)
|
||||
- ADD_SUBDIRECTORY(png)
|
||||
-ENDIF(PNG_FOUND)
|
||||
IF(TIFF_FOUND)
|
||||
ADD_SUBDIRECTORY(tiff)
|
||||
ENDIF(TIFF_FOUND)
|
@ -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);
|
Loading…
Reference in new issue