[Hdrflow-svn] SF.net SVN: hdrflow: [307] trunk/lib
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [307] trunk/lib
|
From: <gl...@us...> - 2007-09-19 20:20:34
|
Revision: 307
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=307&view=rev
Author: glslang
Date: 2007-09-19 13:20:16 -0700 (Wed, 19 Sep 2007)
Log Message:
-----------
+ build fixes
Modified Paths:
--------------
trunk/lib/extras/extras_vc8.sln
trunk/lib/extras/src/panoramic/panoramic.cpp
trunk/lib/extras/src/ppm/ppm_plugin.cpp
trunk/lib/extras/src/raw/raw.cpp
trunk/lib/openlibraries/src/openpluginlib/pl/openplugin.hpp
Modified: trunk/lib/extras/extras_vc8.sln
===================================================================
--- trunk/lib/extras/extras_vc8.sln 2007-09-16 17:48:14 UTC (rev 306)
+++ trunk/lib/extras/extras_vc8.sln 2007-09-19 20:20:16 UTC (rev 307)
@@ -22,28 +22,56 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ppm", "src\ppm\ppm_vc8.vcproj", "{95CD0C43-860C-467B-9995-E6A4E0F8519B}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "noise", "src\noise\noise_vc8.vcproj", "{927446CD-3483-4CCF-B581-F0896DD4A550}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
Multi-threaded Debug DLL|Win32 = Multi-threaded Debug DLL|Win32
Multi-threaded Release DLL|Win32 = Multi-threaded Release DLL|Win32
+ Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {B4CCC2D9-D505-4B08-B908-B2A38105ABC8}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {C8F73831-1355-45C9-BD1B-C7AAB4CDE373}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {9A2197B4-ABC1-4047-A81B-15E9D228C108}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {9A2197B4-ABC1-4047-A81B-15E9D228C108}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{9A2197B4-ABC1-4047-A81B-15E9D228C108}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {9A2197B4-ABC1-4047-A81B-15E9D228C108}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {9A2197B4-ABC1-4047-A81B-15E9D228C108}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {95CD0C43-860C-467B-9995-E6A4E0F8519B}.Debug|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {95CD0C43-860C-467B-9995-E6A4E0F8519B}.Debug|Win32.Build.0 = Multi-threaded Release DLL|Win32
{95CD0C43-860C-467B-9995-E6A4E0F8519B}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{95CD0C43-860C-467B-9995-E6A4E0F8519B}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{95CD0C43-860C-467B-9995-E6A4E0F8519B}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{95CD0C43-860C-467B-9995-E6A4E0F8519B}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {95CD0C43-860C-467B-9995-E6A4E0F8519B}.Release|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
+ {95CD0C43-860C-467B-9995-E6A4E0F8519B}.Release|Win32.Build.0 = Multi-threaded Release DLL|Win32
+ {927446CD-3483-4CCF-B581-F0896DD4A550}.Debug|Win32.ActiveCfg = Debug|Win32
+ {927446CD-3483-4CCF-B581-F0896DD4A550}.Debug|Win32.Build.0 = Debug|Win32
+ {927446CD-3483-4CCF-B581-F0896DD4A550}.Multi-threaded Debug DLL|Win32.ActiveCfg = Debug|Win32
+ {927446CD-3483-4CCF-B581-F0896DD4A550}.Multi-threaded Debug DLL|Win32.Build.0 = Debug|Win32
+ {927446CD-3483-4CCF-B581-F0896DD4A550}.Multi-threaded Release DLL|Win32.ActiveCfg = Release|Win32
+ {927446CD-3483-4CCF-B581-F0896DD4A550}.Multi-threaded Release DLL|Win32.Build.0 = Release|Win32
+ {927446CD-3483-4CCF-B581-F0896DD4A550}.Release|Win32.ActiveCfg = Release|Win32
+ {927446CD-3483-4CCF-B581-F0896DD4A550}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -55,6 +83,7 @@
{CE7A290A-13C0-424E-A02A-96CDC6B0E6BE} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
{4E0BD6BF-2B4D-4BF8-BEB7-3BFF57D627BC} = {2644DB77-2096-4A50-A23F-C57D3C011FE2}
{B4CCC2D9-D505-4B08-B908-B2A38105ABC8} = {675FBBBA-6681-49E3-AAC6-FE371310DA63}
+ {927446CD-3483-4CCF-B581-F0896DD4A550} = {E0C3CF4A-5F43-4BBC-B7A9-6D4CDB225CD9}
{C8F73831-1355-45C9-BD1B-C7AAB4CDE373} = {D133B05E-F174-4CDA-8FF4-C45C139CFACD}
{9A2197B4-ABC1-4047-A81B-15E9D228C108} = {CE7A290A-13C0-424E-A02A-96CDC6B0E6BE}
{95CD0C43-860C-467B-9995-E6A4E0F8519B} = {4E0BD6BF-2B4D-4BF8-BEB7-3BFF57D627BC}
Modified: trunk/lib/extras/src/panoramic/panoramic.cpp
===================================================================
--- trunk/lib/extras/src/panoramic/panoramic.cpp 2007-09-16 17:48:14 UTC (rev 306)
+++ trunk/lib/extras/src/panoramic/panoramic.cpp 2007-09-19 20:20:16 UTC (rev 307)
@@ -2,7 +2,7 @@
// panoramic - Panoramic transformations plugin.
// Copyright (C) 2007 Goncalo N. M. de Carvalho
-// Released under the GPL.
+// Released under the GPLv3 or later.
// For more information, see http://www.hdrflow.com.
#ifdef WIN32
@@ -11,6 +11,12 @@
#include <windows.h>
#endif
+#ifdef WIN32
+# define PANORAMIC_DECLSPEC __declspec( dllexport )
+#else
+# define PANORAMIC_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+#endif
+
#include <ofxImageEffect.h>
#include <openmedialib/ml/openmedialib_plugin.hpp>
@@ -95,7 +101,7 @@
};
}
-struct panoramic_plugin : public ml::openmedialib_plugin
+struct PANORAMIC_DECLSPEC panoramic_plugin : public ml::openmedialib_plugin
{
virtual ml::filter_type_ptr filter( const pl::wstring& ) { return ml::filter_type_ptr( new panoramic_filter ); }
};
@@ -104,28 +110,28 @@
extern "C"
{
- bool openplugin_init( void )
+ PANORAMIC_DECLSPEC bool openplugin_init( void )
{
return true;
}
- bool openplugin_uninit( void )
+ PANORAMIC_DECLSPEC bool openplugin_uninit( void )
{
return true;
}
- bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ PANORAMIC_DECLSPEC bool openplugin_create_plugin( const char*, pl::openplugin** plug )
{
*plug = new hdrflow::extras::pan::panoramic_plugin;
return true;
}
- void openplugin_destroy_plugin( pl::openplugin* plug )
+ PANORAMIC_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
{
delete static_cast<hdrflow::extras::pan::panoramic_plugin*>( plug );
}
- OfxPlugin* OfxGetPlugin( int nth )
+ PANORAMIC_DECLSPEC OfxPlugin* OfxGetPlugin( int nth )
{
if( nth == 0 )
return &hdrflow::extras::pan::panoramic_ofx_plugin;
@@ -133,7 +139,7 @@
return 0;
}
- int OfxGetNumberOfPlugins( )
+ PANORAMIC_DECLSPEC int OfxGetNumberOfPlugins( )
{
return 1;
}
Modified: trunk/lib/extras/src/ppm/ppm_plugin.cpp
===================================================================
--- trunk/lib/extras/src/ppm/ppm_plugin.cpp 2007-09-16 17:48:14 UTC (rev 306)
+++ trunk/lib/extras/src/ppm/ppm_plugin.cpp 2007-09-19 20:20:16 UTC (rev 307)
@@ -2,7 +2,7 @@
// ppm - A PPM reader/writer plugin.
// Copyright (C) 2007 Goncalo N. M. de Carvalho
-// Released under the GPL.
+// Released under the GPLv3 or later.
// For more information, see http://www.hdrflow.com.
#ifdef WIN32
Modified: trunk/lib/extras/src/raw/raw.cpp
===================================================================
--- trunk/lib/extras/src/raw/raw.cpp 2007-09-16 17:48:14 UTC (rev 306)
+++ trunk/lib/extras/src/raw/raw.cpp 2007-09-19 20:20:16 UTC (rev 307)
@@ -26,10 +26,10 @@
namespace il = olib::openimagelib::il;
namespace pcos = olib::openpluginlib::pcos;
+extern "C" int dcraw_( int argc, char** argv );
+
namespace hdrflow { namespace extras { namespace raw {
-extern "C" int dcraw_( int argc, char** argv );
-
namespace
{
struct query_traits
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/openplugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/openplugin.hpp 2007-09-16 17:48:14 UTC (rev 306)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/openplugin.hpp 2007-09-19 20:20:16 UTC (rev 307)
@@ -24,7 +24,7 @@
namespace olib { namespace openpluginlib {
-class openplugin;
+struct openplugin;
extern "C"
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
