[Hdrflow-svn] SF.net SVN: hdrflow: [239] trunk/lib/extras/src

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

Revision: 239
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=239&view=rev
Author:   glslang
Date:     2007-08-09 15:22:55 -0700 (Thu, 09 Aug 2007)

Log Message:
-----------
+ build fixes

Modified Paths:
--------------
    trunk/lib/extras/src/panoramic/panoramic.cpp
    trunk/lib/extras/src/raw/raw.cpp

Modified: trunk/lib/extras/src/panoramic/panoramic.cpp
===================================================================
--- trunk/lib/extras/src/panoramic/panoramic.cpp	2007-08-08 21:44:20 UTC (rev 238)
+++ trunk/lib/extras/src/panoramic/panoramic.cpp	2007-08-09 22:22:55 UTC (rev 239)
@@ -18,7 +18,6 @@
 namespace pl = olib::openpluginlib;
 namespace il = olib::openimagelib::il;
 namespace ml = olib::openmedialib::ml;
-namespace fs = boost::filesystem;
 namespace pcos = olib::openpluginlib::pcos;
 
 namespace extras { namespace hdrflow { namespace pan {
@@ -137,14 +136,14 @@
 	int OfxGetNumberOfPlugins( )
 	{
 		return 1;
-	}
-	
+	}	
+}
+
 #ifdef WIN32
-	BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
-	{
-		if( fdwReason == DLL_PROCESS_ATTACH )
-			DisableThreadLibraryCalls( hInstDLL );
-		return TRUE;
-	}
-#endif
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+	if( fdwReason == DLL_PROCESS_ATTACH )
+		DisableThreadLibraryCalls( hInstDLL );
+	return TRUE;
 }
+#endif

Modified: trunk/lib/extras/src/raw/raw.cpp
===================================================================
--- trunk/lib/extras/src/raw/raw.cpp	2007-08-08 21:44:20 UTC (rev 238)
+++ trunk/lib/extras/src/raw/raw.cpp	2007-08-09 22:22:55 UTC (rev 239)
@@ -11,18 +11,18 @@
 #include <windows.h>
 #endif
 
-#include <openmedialib/il/openimagelib_plugin.hpp>
+#include <openpluginlib/pl/pcos/property_container.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
 
 namespace pl = olib::openpluginlib;
 namespace il = olib::openimagelib::il;
-namespace fs = boost::filesystem;
 namespace pcos = olib::openpluginlib::pcos;
 
 namespace extras { namespace hdrflow { namespace raw {
 
 namespace
 {
-	bool dcraw( property_container properties )
+	bool dcraw( pcos::property_container properties )
 	{
 		return true;
 	}
@@ -54,10 +54,10 @@
 		, tiff_output_( pcos::key::from_string( "tiff_output" ) )
 	{ }
 
-	virtual il::image_type_ptr load( const fs::path& path )
+	virtual il::image_type_ptr load( pl::stream_ptr )
 	{ return il::image_type_ptr( ); }
 	
-	virtual bool store( const fs::path&, const il::image_type_ptr& )
+	virtual bool store( pl::stream_ptr, il::image_type_ptr )
 	{ return false; }
 
 private:
@@ -107,13 +107,14 @@
 	{ 
 		delete static_cast<extras::hdrflow::raw::raw_plugin*>( plug ); 
 	}
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+	if( fdwReason == DLL_PROCESS_ATTACH )
+		DisableThreadLibraryCalls( hInstDLL );
 	
-#ifdef WIN32
-	BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
-	{
-		if( fdwReason == DLL_PROCESS_ATTACH )
-			DisableThreadLibraryCalls( hInstDLL );
-		return TRUE;
-	}
+	return TRUE;
+}
 #endif
-}


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