Thread: [Hdrflow-svn] SF.net SVN: hdrflow: [144] trunk/lib/openlibraries/src/openpluginlib/pl/ openpluginli
Status: Pre-Alpha
Brought to you by:
glslang
From: <gl...@us...> - 2007-05-27 19:53:28
|
Revision: 144 http://hdrflow.svn.sourceforge.net/hdrflow/?rev=144&view=rev Author: glslang Date: 2007-05-27 12:53:26 -0700 (Sun, 27 May 2007) Log Message: ----------- +initial header updates to allow for framework integration Modified Paths: -------------- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp Modified: trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp =================================================================== --- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-05-27 17:50:58 UTC (rev 143) +++ trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-05-27 19:53:26 UTC (rev 144) @@ -17,10 +17,17 @@ #include <functional> #include <vector> +#ifndef FMWK #include <openpluginlib/pl/config.hpp> #include <openpluginlib/pl/discovery_traits.hpp> #include <openpluginlib/pl/openplugin.hpp> #include <openpluginlib/pl/string.hpp> +#else +#include <HDRFlowPlugin/config.hpp> +#include <HDRFlowPlugin/discovery_traits.hpp> +#include <HDRFlowPlugin/openplugin.hpp> +#include <HDRFlowPlugin/string.hpp> +#endif namespace olib { namespace openpluginlib { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-06-24 20:49:07
|
Revision: 162 http://hdrflow.svn.sourceforge.net/hdrflow/?rev=162&view=rev Author: glslang Date: 2007-06-24 13:49:00 -0700 (Sun, 24 Jun 2007) Log Message: ----------- +fix comparison so it doesn't repeat plugins Modified Paths: -------------- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp Modified: trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp =================================================================== --- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-06-24 19:43:26 UTC (rev 161) +++ trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-06-24 20:49:00 UTC (rev 162) @@ -1,6 +1,4 @@ -// openpluginlib - A plugin interface to openlibraries. - // Copyright (C) 2005-2006 VM Inc. // Released under the LGPL. // For more information, see http://www.openlibraries.org. @@ -146,7 +144,7 @@ : public std::binary_function<detail::discover_query_impl::plugin_proxy, detail::discover_query_impl::plugin_proxy, bool> { bool operator( )( const detail::discover_query_impl::plugin_proxy& x, const detail::discover_query_impl::plugin_proxy& y ) const - { return x.merit( ) > y.merit( ); } + { return !( x.merit( ) < y.merit( ) ) && x.name( ) < y.name( ) && x.type( ) < y.type( ); } }; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-06-25 19:09:11
|
Revision: 163 http://hdrflow.svn.sourceforge.net/hdrflow/?rev=163&view=rev Author: glslang Date: 2007-06-25 12:09:09 -0700 (Mon, 25 Jun 2007) Log Message: ----------- + ensures discovery returns a unique set of sorted plugins Modified Paths: -------------- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp Modified: trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp =================================================================== --- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-06-24 20:49:00 UTC (rev 162) +++ trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-06-25 19:09:09 UTC (rev 163) @@ -39,7 +39,7 @@ namespace detail { class OPENPLUGINLIB_DECLSPEC discover_query_impl - { + { public: class OPENPLUGINLIB_DECLSPEC plugin_proxy { @@ -80,6 +80,15 @@ plugin_item& item_; }; + private: + struct equals : std::binary_function<plugin_proxy, plugin_proxy, bool> + { + bool operator( )( const plugin_proxy& x, const plugin_proxy& y ) const + { + return x.name( ) == y.name( ) && x.type( ) == y.type( ); + } + }; + public: typedef std::vector<plugin_proxy> container; typedef container::const_iterator const_iterator; @@ -102,7 +111,10 @@ template<class StrictWeakOrdering> void sort( const StrictWeakOrdering& comp = StrictWeakOrdering( ) ) - { std::sort( plugins_.begin( ), plugins_.end( ), comp ); } + { + std::sort( plugins_.begin( ), plugins_.end( ), comp ); + plugins_.erase( std::unique( plugins_.begin( ), plugins_.end( ), equals( ) ), plugins_.end( ) ); + } private: container plugins_; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-06-25 21:01:24
|
Revision: 165 http://hdrflow.svn.sourceforge.net/hdrflow/?rev=165&view=rev Author: glslang Date: 2007-06-25 14:01:22 -0700 (Mon, 25 Jun 2007) Log Message: ----------- + cleanup Modified Paths: -------------- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp Modified: trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp =================================================================== --- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-06-25 20:57:56 UTC (rev 164) +++ trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-06-25 21:01:22 UTC (rev 165) @@ -74,15 +74,6 @@ plugin_item item_; }; - private: - struct equals : std::binary_function<plugin_proxy, plugin_proxy, bool> - { - bool operator( )( const plugin_proxy& x, const plugin_proxy& y ) const - { - return x.name( ) == y.name( ) && x.type( ) == y.type( ); - } - }; - public: typedef std::vector<plugin_proxy> container; typedef container::const_iterator const_iterator; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-06-27 19:24:54
|
Revision: 166 http://hdrflow.svn.sourceforge.net/hdrflow/?rev=166&view=rev Author: glslang Date: 2007-06-27 12:24:48 -0700 (Wed, 27 Jun 2007) Log Message: ----------- + cleanup after the sort mess Modified Paths: -------------- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp Modified: trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp =================================================================== --- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-06-25 21:01:22 UTC (rev 165) +++ trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-06-27 19:24:48 UTC (rev 166) @@ -138,7 +138,7 @@ : public std::binary_function<detail::discover_query_impl::plugin_proxy, detail::discover_query_impl::plugin_proxy, bool> { bool operator( )( const detail::discover_query_impl::plugin_proxy& x, const detail::discover_query_impl::plugin_proxy& y ) const - { return !( x.merit( ) < y.merit( ) ) && x.name( ) < y.name( ) && x.type( ) < y.type( ); } + { return x.merit( ) > y.merit( ); } }; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gl...@us...> - 2007-08-04 14:22:20
|
Revision: 224 http://hdrflow.svn.sourceforge.net/hdrflow/?rev=224&view=rev Author: glslang Date: 2007-08-04 07:22:14 -0700 (Sat, 04 Aug 2007) Log Message: ----------- + export plugin extensions as a single string Modified Paths: -------------- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp Modified: trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp =================================================================== --- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-08-04 13:27:55 UTC (rev 223) +++ trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-08-04 14:22:14 UTC (rev 224) @@ -65,6 +65,14 @@ { return item_.in_filter; } wstring out_filter( ) const { return item_.out_filter; } + wstring extension( ) const + { + wstring ext; + for( std::vector<wstring>::const_iterator I = item_.extension.begin( ); I != item_.extension.end( ); ++I ) + ext += *I + L" "; + + return ext; + } int merit( ) const { return item_.merit; } void* context( ) const This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |