[Hdrflow-svn] SF.net SVN: hdrflow: [134] trunk/lib/openlibraries
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [134] trunk/lib/openlibraries
|
From: <gl...@us...> - 2007-05-21 20:02:51
|
Revision: 134
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=134&view=rev
Author: glslang
Date: 2007-05-21 13:02:43 -0700 (Mon, 21 May 2007)
Log Message:
-----------
+ tidy ups
Modified Paths:
--------------
trunk/lib/openlibraries/openlibraries_vc8.sln
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
Removed Paths:
-------------
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/config.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx.cpp
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.hpp
Modified: trunk/lib/openlibraries/openlibraries_vc8.sln
===================================================================
--- trunk/lib/openlibraries/openlibraries_vc8.sln 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/openlibraries_vc8.sln 2007-05-21 20:02:43 UTC (rev 134)
@@ -188,13 +188,6 @@
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "avformat", "src\openmedialib\plugins\avformat\avformat_vc8.vcproj", "{0C4F7499-83C6-4143-A392-56F299345E8A}"
- ProjectSection(ProjectDependencies) = postProject
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gensys", "src\openmedialib\plugins\gensys\gensys_vc8.vcproj", "{88BCD57E-044F-4427-A407-541BA8A938E6}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
@@ -202,13 +195,6 @@
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew", "src\openmedialib\plugins\glew\glew_vc8.vcproj", "{649D053D-1768-40BB-8FA7-8CD91A765F32}"
- ProjectSection(ProjectDependencies) = postProject
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofx", "src\openmedialib\plugins\ofx\ofx_vc8.vcproj", "{A60E2710-2DA9-4641-AEF6-6488A6264723}"
ProjectSection(ProjectDependencies) = postProject
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
@@ -223,13 +209,6 @@
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "openal", "src\openmedialib\plugins\openal\openal_vc8.vcproj", "{68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}"
- ProjectSection(ProjectDependencies) = postProject
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- EndProjectSection
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "quicktime", "src\openmedialib\plugins\quicktime\quicktime_vc8.vcproj", "{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}"
ProjectSection(ProjectDependencies) = postProject
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
@@ -237,13 +216,6 @@
{C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "template", "src\openmedialib\plugins\template\template_vc8.vcproj", "{18271104-A6E4-4293-A6F1-70B15AE311E5}"
- ProjectSection(ProjectDependencies) = postProject
- {C9BA7656-B238-4882-A30A-EC2BDB2843B4} = {C9BA7656-B238-4882-A30A-EC2BDB2843B4}
- {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0} = {3D424B92-233E-4BA0-AFD3-0FD1D80F5DD0}
- {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC}
- EndProjectSection
-EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SG", "SG", "{BD86F550-C573-4A68-955B-6CEDCC8F595D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{9483FC7B-E396-43E6-84ED-EB021AC54252}"
@@ -528,18 +500,10 @@
{1C648B54-C3DC-49B5-AFC9-B205F3151F81}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{1C648B54-C3DC-49B5-AFC9-B205F3151F81}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{1C648B54-C3DC-49B5-AFC9-B205F3151F81}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {0C4F7499-83C6-4143-A392-56F299345E8A}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{88BCD57E-044F-4427-A407-541BA8A938E6}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{88BCD57E-044F-4427-A407-541BA8A938E6}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{88BCD57E-044F-4427-A407-541BA8A938E6}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{88BCD57E-044F-4427-A407-541BA8A938E6}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {649D053D-1768-40BB-8FA7-8CD91A765F32}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {649D053D-1768-40BB-8FA7-8CD91A765F32}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {649D053D-1768-40BB-8FA7-8CD91A765F32}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {649D053D-1768-40BB-8FA7-8CD91A765F32}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{A60E2710-2DA9-4641-AEF6-6488A6264723}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{A60E2710-2DA9-4641-AEF6-6488A6264723}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{A60E2710-2DA9-4641-AEF6-6488A6264723}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -548,18 +512,10 @@
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
- {18271104-A6E4-4293-A6F1-70B15AE311E5}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
- {18271104-A6E4-4293-A6F1-70B15AE311E5}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
- {18271104-A6E4-4293-A6F1-70B15AE311E5}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
- {18271104-A6E4-4293-A6F1-70B15AE311E5}.Multi-threaded Release DLL|Win32.Build.0 = Multi-threaded Release DLL|Win32
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Debug DLL|Win32.ActiveCfg = Multi-threaded Debug DLL|Win32
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Debug DLL|Win32.Build.0 = Multi-threaded Debug DLL|Win32
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E}.Multi-threaded Release DLL|Win32.ActiveCfg = Multi-threaded Release DLL|Win32
@@ -723,14 +679,10 @@
{DB59A3DD-CC08-4FFD-ADFA-F659B2FC78B1} = {D9066C6C-E143-472F-860E-004E481F3E0A}
{84DAF5D6-05DE-4B4B-AB54-4CD2039EE5DC} = {F76943CD-19F1-469A-B725-38C44C2DD27F}
{1C648B54-C3DC-49B5-AFC9-B205F3151F81} = {F76943CD-19F1-469A-B725-38C44C2DD27F}
- {0C4F7499-83C6-4143-A392-56F299345E8A} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{88BCD57E-044F-4427-A407-541BA8A938E6} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
- {649D053D-1768-40BB-8FA7-8CD91A765F32} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{A60E2710-2DA9-4641-AEF6-6488A6264723} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{C29BD9EC-EC1B-4D7F-8985-F85698CE66ED} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
- {68B4BE77-E59E-4A24-9AF5-D4CEFF132B51} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{1AC3D22B-175B-4169-B74A-276F9D5BA7AB} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
- {18271104-A6E4-4293-A6F1-70B15AE311E5} = {C039BC12-D0D0-4BAC-B8E4-445EEA6678B8}
{DCCDFFF5-23EB-4E4B-BE38-9E5F8D42151E} = {BD86F550-C573-4A68-955B-6CEDCC8F595D}
{AE1793B8-18EA-4277-BFDD-8C9F2AFA0096} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
{7A98C731-F651-4427-BD02-25133DEA7171} = {9483FC7B-E396-43E6-84ED-EB021AC54252}
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap.cpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,33 +0,0 @@
-
-// lightmap3D - An lightmap3D plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace lightmap = olib::openimagelib::plugins::lightmap;
-
-extern "C"
-{
- LIGHTMAP3D_DECLSPEC bool openplugin_init( void )
- {
- return true;
- }
-
- LIGHTMAP3D_DECLSPEC bool openplugin_uninit( void )
- {
- return true;
- }
-
- LIGHTMAP3D_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
- {
- *plug = new lightmap::lightmap3D_plugin;
- return true;
- }
-
- LIGHTMAP3D_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
- { delete static_cast<lightmap::lightmap3D_plugin*>( plug ); }
-}
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -6,21 +6,19 @@
// For more information, see http://www.openlibraries.org.
#include <cstdlib>
-
#include <boost/tokenizer.hpp>
-#include <openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
namespace fs = boost::filesystem;
namespace il = olib::openimagelib::il;
+namespace pl = olib::openpluginlib;
-namespace olib { namespace openimagelib { namespace plugins { namespace lightmap {
+namespace olib { namespace openimagelib { namespace il {
-typedef il::image<unsigned char, il::surface_format> image_type;
-
namespace
{
- void destroy( image_type* im )
+ void destroy( il::image_type* im )
{ delete im; }
bool discover_lightmap_size( const boost::filesystem::path& path, int& radius )
@@ -85,10 +83,46 @@
}
}
-il::image_type_ptr lightmap3D_plugin::load( const fs::path& path )
-{ return il::image_type_ptr( generate_lightmap( path ) ); }
+class lightmap3D_plugin : public il::openimagelib_plugin
+{
+public:
+ virtual il::image_type_ptr load( const boost::filesystem::path& path )
+ { return generate_lightmap( path ); }
+
+ virtual bool store( const boost::filesystem::path&, const il::image_type_ptr& )
+ { return false; }
+};
-bool lightmap3D_plugin::store( const fs::path& path, const il::image_type_ptr& )
-{ return false; }
+} } }
-} } } }
+extern "C"
+{
+ bool openplugin_init( void )
+ {
+ return true;
+ }
+
+ bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ {
+ *plug = new il::lightmap3D_plugin;
+ return true;
+ }
+
+ void openplugin_destroy_plugin( pl::openplugin* plug )
+ { delete static_cast<il::lightmap3D_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.hpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_plugin.hpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,25 +0,0 @@
-
-// 3D_lightmap - A lightmap generator plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef LIGHTMAP3D_PLUGIN_INC_
-#define LIGHTMAP3D_PLUGIN_INC_
-
-#include <openimagelib/plugins/3D_lightmap/config.hpp>
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace olib { namespace openimagelib { namespace plugins { namespace lightmap {
-
-class LIGHTMAP3D_DECLSPEC lightmap3D_plugin : public olib::openimagelib::il::openimagelib_plugin
-{
-public:
- virtual il::image_type_ptr load( const boost::filesystem::path& path );
- virtual bool store( const boost::filesystem::path& path, const il::image_type_ptr& image );
-};
-
-} } } }
-
-#endif
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/3D_lightmap_vc8.vcproj 2007-05-21 20:02:43 UTC (rev 134)
@@ -194,10 +194,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\3D_lightmap.cpp"
- >
- </File>
- <File
RelativePath=".\3D_lightmap_plugin.cpp"
>
</File>
@@ -207,14 +203,6 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
- <File
- RelativePath=".\3D_lightmap_plugin.hpp"
- >
- </File>
- <File
- RelativePath=".\config.hpp"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am 2007-05-21 20:02:43 UTC (rev 134)
@@ -8,15 +8,11 @@
lib_LTLIBRARIES = libopenimagelib_3D_lightmap.la
libopenimagelib_3D_lightmap_la_SOURCES = \
- config.hpp \
- 3D_lightmap.cpp \
- 3D_lightmap_plugin.hpp \
3D_lightmap_plugin.cpp
libopenimagelib_3D_lightmap_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH) \
- # end
+ $(BOOST_INCLUDE_PATH)
libopenimagelib_3D_lightmap_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/config.hpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/config.hpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,25 +0,0 @@
-
-// 3D_lightmap - A lightmap generator plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef LIGHTMAP3D_CONFIG_INC_
-#define LIGHTMAP3D_CONFIG_INC_
-
-#ifdef WIN32
- #ifdef LIGHTMAP3D_EXPORTS
- #define LIGHTMAP3D_DECLSPEC __declspec( dllexport )
- #else
- #define LIGHTMAP3D_DECLSPEC __declspec( dllimport )
- #endif // LIGHTMAP3D_EXPORTS
-#else
- #ifdef LIGHTMAP3D_EXPORTS
- #define LIGHTMAP3D_DECLSPEC
- #else
- #define LIGHTMAP3D_DECLSPEC
- #endif // LIGHTMAP3D_EXPORTS
-#endif // WIN32
-
-#endif
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am 2007-05-21 20:02:43 UTC (rev 134)
@@ -8,15 +8,11 @@
lib_LTLIBRARIES = libopenimagelib_bmp.la
libopenimagelib_bmp_la_SOURCES = \
- config.hpp \
- bmp.cpp \
- bmp_plugin.hpp \
bmp_plugin.cpp
libopenimagelib_bmp_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH) \
- # end
+ $(BOOST_INCLUDE_PATH)
libopenimagelib_bmp_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,33 +0,0 @@
-
-// BMP - An BMP plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openimagelib/plugins/bmp/bmp_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace BMP = olib::openimagelib::plugins::BMP;
-
-extern "C"
-{
- BMP_DECLSPEC bool openplugin_init( void )
- {
- return true;
- }
-
- BMP_DECLSPEC bool openplugin_uninit( void )
- {
- return true;
- }
-
- BMP_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
- {
- *plug = new BMP::BMP_plugin;
- return true;
- }
-
- BMP_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
- { delete static_cast<BMP::BMP_plugin*>( plug ); }
-}
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -5,34 +5,57 @@
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
-#include <openimagelib/plugins/bmp/bmp_plugin.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
namespace il = olib::openimagelib::il;
namespace fs = boost::filesystem;
+namespace pl = olib::openpluginlib;
-namespace olib { namespace openimagelib { namespace plugins { namespace BMP {
+namespace olib { namespace openimagelib { namespace il {
namespace
{
- typedef struct tagBITMAPINFOHEADER
- {
- } BITMAPINFOHEADER, *PBITMAPINFOHEADER;
+}
+
+struct bmp_plugin : public il::openimagelib_plugin
+{
+ virtual il::image_type_ptr load( const boost::filesystem::path& )
+ { return il::image_type_ptr( ); }
- void destroy( il::image_type* im )
- { delete im; }
-
- il::image_type_ptr load_bmp( const fs::path& path )
+ virtual bool store( const boost::filesystem::path&, const il::image_type_ptr& )
+ { return false; }
+};
+
+} } }
+
+extern "C"
+{
+ bool openplugin_init( void )
{
- return il::image_type_ptr( );
+ return true;
}
+
+ bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ {
+ *plug = new il::bmp_plugin;
+ return true;
+ }
+
+ void openplugin_destroy_plugin( pl::openplugin* plug )
+ { delete static_cast<il::bmp_plugin*>( plug ); }
}
-il::image_type_ptr BMP_plugin::load( const fs::path& path )
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
{
- return il::image_type_ptr( );
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
}
-
-bool BMP_plugin::store( const fs::path& /*path*/, const il::image_type_ptr& )
-{ return false; }
-
-} } } }
+#endif
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,26 +0,0 @@
-
-// BMP - A BMP plugin to il.
-
-// Copyright (C) 2005 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef BMP_PLUGIN_INC_
-#define BMP_PLUGIN_INC_
-
-#include <boost/filesystem/path.hpp>
-
-#include <openimagelib/plugins/bmp/config.hpp>
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace olib { namespace openimagelib { namespace plugins { namespace BMP {
-
-struct BMP_DECLSPEC BMP_plugin : public il::openimagelib_plugin
-{
- virtual il::image_type_ptr load( const boost::filesystem::path& path );
- virtual bool store( const boost::filesystem::path& path, const il::image_type_ptr& image );
-};
-
-} } } }
-
-#endif
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/bmp_vc8.vcproj 2007-05-21 20:02:43 UTC (rev 134)
@@ -203,10 +203,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\bmp.cpp"
- >
- </File>
- <File
RelativePath=".\bmp_plugin.cpp"
>
</File>
@@ -216,14 +212,6 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
- <File
- RelativePath=".\bmp_plugin.hpp"
- >
- </File>
- <File
- RelativePath=".\config.hpp"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,25 +0,0 @@
-
-// BMP - An BMP plugin to il.
-
-// Copyright (C) 2005 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef BMP_CONFIG_INC_
-#define BMP_CONFIG_INC_
-
-#ifdef WIN32
- #ifdef BMP_EXPORTS
- #define BMP_DECLSPEC __declspec( dllexport )
- #else
- #define BMP_DECLSPEC __declspec( dllimport )
- #endif // BMP_EXPORTS
-#else
- #ifdef BMP_EXPORTS
- #define BMP_DECLSPEC extern
- #else
- #define BMP_DECLSPEC
- #endif // BMP_EXPORTS
-#endif // WIN32
-
-#endif // BMP_CONFIG_INC_
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am 2007-05-21 20:02:43 UTC (rev 134)
@@ -8,9 +8,6 @@
lib_LTLIBRARIES = libopenimagelib_dds.la
libopenimagelib_dds_la_SOURCES = \
- config.hpp \
- dds.cpp \
- dds_plugin.hpp \
dds_plugin.cpp
libopenimagelib_dds_la_CXXFLAGS = \
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/dds/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/config.hpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/config.hpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,25 +0,0 @@
-
-// DDS - An DDS plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef DDS_CONFIG_INC_
-#define DDS_CONFIG_INC_
-
-#ifdef WIN32
- #ifdef DDS_EXPORTS
- #define DDS_DECLSPEC __declspec( dllexport )
- #else
- #define DDS_DECLSPEC __declspec( dllimport )
- #endif // DDS_EXPORTS
-#else
- #ifdef DDS_EXPORTS
- #define DDS_DECLSPEC __attribute__( ( visibility( "default" ) ) )
- #else
- #define DDS_DECLSPEC
- #endif // DDS_EXPORTS
-#endif // WIN32
-
-#endif // DDS_CONFIG_INC_
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds.cpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,33 +0,0 @@
-
-// DDS - An DDS plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openimagelib/plugins/dds/dds_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace DDS = olib::openimagelib::plugins::DDS;
-
-extern "C"
-{
- DDS_DECLSPEC bool openplugin_init( void )
- {
- return true;
- }
-
- DDS_DECLSPEC bool openplugin_uninit( void )
- {
- return true;
- }
-
- DDS_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
- {
- *plug = new DDS::DDS_plugin;
- return true;
- }
-
- DDS_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
- { delete static_cast<DDS::DDS_plugin*>( plug ); }
-}
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -12,12 +12,13 @@
#include <boost/filesystem/fstream.hpp>
-#include <openimagelib/plugins/dds/dds_plugin.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
namespace il = olib::openimagelib::il;
namespace fs = boost::filesystem;
+namespace pl = olib::openpluginlib;
-namespace olib { namespace openimagelib { namespace plugins { namespace DDS {
+namespace olib { namespace openimagelib { namespace il {
namespace
{
@@ -214,10 +215,45 @@
}
}
-il::image_type_ptr DDS_plugin::load( const fs::path& path )
-{ return load_dds( path ); }
+struct dds_plugin : public il::openimagelib_plugin
+{
+ virtual il::image_type_ptr load( const boost::filesystem::path& path )
+ { return load_dds( path ); }
+
+ virtual bool store( const boost::filesystem::path&, const il::image_type_ptr& )
+ { return false; }
+};
-bool DDS_plugin::store( const fs::path& path, const il::image_type_ptr& )
-{ return false; }
+} } }
-} } } }
+extern "C"
+{
+ bool openplugin_init( void )
+ {
+ return true;
+ }
+
+ bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ {
+ *plug = new il::dds_plugin;
+ return true;
+ }
+
+ void openplugin_destroy_plugin( pl::openplugin* plug )
+ { delete static_cast<il::dds_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.hpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_plugin.hpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,26 +0,0 @@
-
-// DDS - A DDS plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef DDS_PLUGIN_INC_
-#define DDS_PLUGIN_INC_
-
-#include <boost/filesystem/path.hpp>
-
-#include <openimagelib/plugins/dds/config.hpp>
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace olib { namespace openimagelib { namespace plugins { namespace DDS {
-
-struct DDS_DECLSPEC DDS_plugin : public olib::openimagelib::il::openimagelib_plugin
-{
- virtual il::image_type_ptr load( const boost::filesystem::path& path );
- virtual bool store( const boost::filesystem::path& path, const il::image_type_ptr& image );
-};
-
-} } } }
-
-#endif
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/dds_vc8.vcproj 2007-05-21 20:02:43 UTC (rev 134)
@@ -196,10 +196,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\dds.cpp"
- >
- </File>
- <File
RelativePath=".\dds_plugin.cpp"
>
</File>
@@ -209,14 +205,6 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
- <File
- RelativePath=".\config.hpp"
- >
- </File>
- <File
- RelativePath=".\dds_plugin.hpp"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am 2007-05-21 20:02:43 UTC (rev 134)
@@ -8,9 +8,6 @@
lib_LTLIBRARIES = libopenimagelib_dpx.la
libopenimagelib_dpx_la_SOURCES = \
- config.hpp \
- dpx.cpp \
- dpx_plugin.hpp \
dpx_plugin.cpp
libopenimagelib_dpx_la_CXXFLAGS = \
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/config.hpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/config.hpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,25 +0,0 @@
-
-// dpx - A dpx plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef DPX_CONFIG_INC_
-#define DPX_CONFIG_INC_
-
-#ifdef WIN32
- #ifdef DPX_EXPORTS
- #define DPX_DECLSPEC __declspec( dllexport )
- #else
- #define DPX_DECLSPEC __declspec( dllimport )
- #endif // DPX_EXPORTS
-#else
- #ifdef DPX_EXPORTS
- #define DPX_DECLSPEC
- #else
- #define DPX_DECLSPEC
- #endif // DPX_EXPORTS
-#endif // WIN32
-
-#endif
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx.cpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,34 +0,0 @@
-
-// DPX - A DPX plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#include <openimagelib/plugins/dpx/dpx_plugin.hpp>
-
-namespace opl = olib::openpluginlib;
-namespace DPX = olib::openimagelib::plugins::DPX;
-
-extern "C"
-{
- DPX_DECLSPEC bool openplugin_init( void )
- {
- return true;
- }
-
- DPX_DECLSPEC bool openplugin_uninit( void )
- {
- return true;
- }
-
- DPX_DECLSPEC bool openplugin_create_plugin( const char*, opl::openplugin** plug )
- {
- *plug = new DPX::DPX_plugin;
-
- return true;
- }
-
- DPX_DECLSPEC void openplugin_destroy_plugin( opl::openplugin* plug )
- { delete static_cast<DPX::DPX_plugin*>( plug ); }
-}
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -9,12 +9,13 @@
#include <boost/filesystem/fstream.hpp>
-#include <openimagelib/plugins/dpx/dpx_plugin.hpp>
+#include <openimagelib/il/openimagelib_plugin.hpp>
namespace il = olib::openimagelib::il;
namespace fs = boost::filesystem;
+namespace pl = olib::openpluginlib;
-namespace olib { namespace openimagelib { namespace plugins { namespace DPX {
+namespace olib { namespace openimagelib { namespace il {
namespace
{
@@ -854,10 +855,45 @@
}
}
-il::image_type_ptr DPX_plugin::load( const fs::path& path )
-{ return load_dpx( path ); }
+struct dpx_plugin : public il::openimagelib_plugin
+{
+ virtual il::image_type_ptr load( const boost::filesystem::path& path )
+ { return load_dpx( path ); }
+
+ virtual bool store( const boost::filesystem::path& path, const il::image_type_ptr& im )
+ { return store_dpx( path, im ); }
+};
-bool DPX_plugin::store( const fs::path& path, const il::image_type_ptr& im )
-{ return store_dpx( path, im ); }
+} } }
-} } } }
+extern "C"
+{
+ bool openplugin_init( void )
+ {
+ return true;
+ }
+
+ bool openplugin_uninit( void )
+ {
+ return true;
+ }
+
+ bool openplugin_create_plugin( const char*, pl::openplugin** plug )
+ {
+ *plug = new il::dpx_plugin;
+ return true;
+ }
+
+ void openplugin_destroy_plugin( pl::openplugin* plug )
+ { delete static_cast<il::dpx_plugin*>( plug ); }
+}
+
+#ifdef WIN32
+extern "C" BOOL WINAPI DllMain( HINSTANCE hInstDLL, DWORD fdwReason, LPVOID )
+{
+ if( fdwReason == DLL_PROCESS_ATTACH )
+ DisableThreadLibraryCalls( hInstDLL );
+
+ return TRUE;
+}
+#endif
Deleted: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.hpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_plugin.hpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -1,26 +0,0 @@
-
-// DPX - A DPX plugin to il.
-
-// Copyright (C) 2005-2006 VM Inc.
-// Released under the LGPL.
-// For more information, see http://www.openlibraries.org.
-
-#ifndef DPX_PLUGIN_INC_
-#define DPX_PLUGIN_INC_
-
-#include <boost/filesystem/path.hpp>
-
-#include <openimagelib/plugins/dpx/config.hpp>
-#include <openimagelib/il/openimagelib_plugin.hpp>
-
-namespace olib { namespace openimagelib { namespace plugins { namespace DPX {
-
-struct DPX_DECLSPEC DPX_plugin : public olib::openimagelib::il::openimagelib_plugin
-{
- virtual il::image_type_ptr load( const boost::filesystem::path& path );
- virtual bool store( const boost::filesystem::path& path, const il::image_type_ptr& image );
-};
-
-} } } }
-
-#endif
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/dpx_vc8.vcproj 2007-05-21 20:02:43 UTC (rev 134)
@@ -190,10 +190,6 @@
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
- RelativePath=".\dpx.cpp"
- >
- </File>
- <File
RelativePath=".\dpx_plugin.cpp"
>
</File>
@@ -203,14 +199,6 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
- <File
- RelativePath=".\config.hpp"
- >
- </File>
- <File
- RelativePath=".\dpx_plugin.hpp"
- >
- </File>
</Filter>
<Filter
Name="Resource Files"
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp 2007-05-20 22:48:57 UTC (rev 133)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp 2007-05-21 20:02:43 UTC (rev 134)
@@ -3364,24 +3364,24 @@
extern "C"
{
- ML_PLUGIN_DECLSPEC bool openplugin_init( void )
+ bool openplugin_init( void )
{
return true;
}
- ML_PLUGIN_DECLSPEC bool openplugin_uninit( void )
+ bool openplugin_uninit( void )
{
return true;
}
- ML_PLUGIN_DECLSPEC bool openplugin_create_plugin( const char* options, pl::openplugin** plug )
+ bool openplugin_create_plugin( const char* options, pl::openplugin** plug )
{
*plug = new ml::ofx_plugin;
return true;
}
- ML_PLUGIN_DECLSPEC void openplugin_destroy_plugin( pl::openplugin* plug )
+ void openplugin_destroy_plugin( pl::openplugin* plug )
{
delete static_cast<ml::ofx_plugin*>( plug );
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
