[Hdrflow-svn] SF.net SVN: hdrflow: [79] lib/openlibraries

[<gl...@us...>]

Revision: 79
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=79&view=rev
Author:   glslang
Date:     2007-04-13 03:28:42 -0700 (Fri, 13 Apr 2007)

Log Message:
-----------
+ *nix build fix
+ disable ILM tonemap if OpenEXR is not present

Modified Paths:
--------------
    lib/openlibraries/openlibraries.pc.in
    lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp

Modified: lib/openlibraries/openlibraries.pc.in
===================================================================
--- lib/openlibraries/openlibraries.pc.in	2007-04-12 22:17:21 UTC (rev 78)
+++ lib/openlibraries/openlibraries.pc.in	2007-04-13 10:28:42 UTC (rev 79)
@@ -10,6 +10,7 @@
 
 OPENIMAGELIB_PLUGINS=@OPENIMAGELIB_PLUGINPATH@
 OPENMEDIALIB_PLUGINS=@OPENMEDIALIB_PLUGINPATH@
+OPENEFFECTSLIB_PLUGINS=@OPENEFFECTSLIB_PLUGINPATH@
 OPENOBJECTLIB_PLUGINS=@OPENOBJECTLIB_PLUGINPATH@
 OPENASSETLIB_PLUGINS=@OPENASSETLIB_PLUGINPATH@
 
@@ -18,7 +19,7 @@
 Version: @OL_MAJOR@.@OL_MINOR@.@OL_SUB@
 
 Libs: @OPENPLUGINLIB_RPATH@ @OPENIMAGELIB_RPATH@ @OPENMEDIALIB_RPATH@ @OPENOBJECTLIB_RPATH@ \
-	  @OPENASSETLIB_RPATH@ @OPENEFFECTSLIB_RPATH@ @BOOST_LIB_RPATH@ @GLEW_LIB_RPATH@ 	\
+	  @OPENASSETLIB_RPATH@ @BOOST_LIB_RPATH@ @GLEW_LIB_RPATH@ 	\
 	 -L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openobjectlib/@OL_LIBNAME@ -lopenobjectlib_sg \
 	 -L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openimagelib/@OL_LIBNAME@ -lopenimagelib_il \
 	 -L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openmedialib/@OL_LIBNAME@ -lopenmedialib_ml \
@@ -29,3 +30,4 @@
 
 Cflags: -I${includedir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@ -I${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/include \
 		@BOOST_INCLUDE_PATH@ @GLEW_INCLUDE_PATH@
+

Modified: lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp
===================================================================
--- lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp	2007-04-12 22:17:21 UTC (rev 78)
+++ lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.cpp	2007-04-13 10:28:42 UTC (rev 79)
@@ -391,6 +391,7 @@
 	pcos::property prop_maxval_;
 };
 
+#ifdef HAVE_OPENEXR
 class ML_PLUGIN_DECLSPEC tm_ilm_exr_filter : public filter_type
 {
 public:
@@ -427,6 +428,7 @@
 	pcos::property prop_knee_low_;
 	pcos::property prop_knee_high_;
 };
+#endif
 
 class ML_PLUGIN_DECLSPEC tm_ferwerda_filter : public filter_type
 {
@@ -476,8 +478,10 @@
 	{
 		if( request == L"tm_linear" )
 			return filter_type_ptr( new tm_linear_filter( ) );
+#	ifdef HAVE_OPENEXR
 		else if( request == L"tm_ilm_exr" )
 			return filter_type_ptr( new tm_ilm_exr_filter( ) );
+#	endif
 		else if( request == L"tm_ferwerda" )
 			return filter_type_ptr( new tm_ferwerda_filter( ) );
 		else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.