generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

boost dependency has been removed

Browse Source
This commit is contained in:
ozantonkal
2013-05-30 20:01:33 +02:00
parent e10582ce4f
commit 6603cc4405
8 changed files with 70 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
modules/viz/src/q/viz3d_impl.hpp
View File

@@ -27,53 +27,13 @@ public:
* \param[in] callback function that will be registered as a callback for a keyboard event
* \param[in] cookie for passing user data to callback
*/
void registerKeyboardCallback(void (*callback)(const cv::KeyboardEvent&, void*), void* cookie = NULL);
void registerKeyboardCallback(void (*callback)(const cv::KeyboardEvent&, void*), void* cookie = 0);
// TODO Implement callback function as a method of an instance
/** \brief Register a callback function for keyboard input
* \param[in] callback function that will be registered as a callback for a keyboard event
* \param[in] instance the instance that the callback function belongs to
* \param[in] cookie for passing user data to callback
*/
// template<typename T> inline void registerKeyboardCallback(void (T::*callback)(const cv::KeyboardEvent&, void*), T& instance, void* cookie = NULL)
// { }
// /** \brief Register a callback boost::function for keyboard events
// * \param[in] cb a boost function that will be registered as a callback for a keyboard event
// * \return a connection object that allows to disconnect the callback function.
// */
// void registerKeyboardCallback (boost::function<void (const cv::KeyboardEvent&)> cb);
// inline boost::signals2::connection registerKeyboardCallback (void (*callback) (const cv::KeyboardEvent&, void*), void* cookie = NULL)
// { return (registerKeyboardCallback (boost::bind (callback, _1, cookie))); }
//
// /** \brief Register a callback function for keyboard events
// * \param[in] callback the member function that will be registered as a callback for a keyboard event
// * \param[in] instance instance to the class that implements the callback function
// * \param[in] cookie user data that is passed to the callback
// * \return a connection object that allows to disconnect the callback function.
// */
// template<typename T> inline boost::signals2::connection registerKeyboardCallback (void (T::*callback) (const cv::KeyboardEvent&, void*), T& instance, void* cookie = NULL)
// { return (registerKeyboardCallback (boost::bind (callback, boost::ref (instance), _1, cookie))); }
/** \brief Register a callback function for mouse events
* \param[in] cb a boost function that will be registered as a callback for a mouse event
* \return a connection object that allows to disconnect the callback function.
* \param[in] ccallback function that will be registered as a callback for a mouse event
* \param[in] cookie for passing user data to callback
*/
boost::signals2::connection registerMouseCallback (boost::function<void (const cv::MouseEvent&)> cb);
inline boost::signals2::connection registerMouseCallback (void (*callback) (const cv::MouseEvent&, void*), void* cookie = NULL)
{ return (registerMouseCallback (boost::bind (callback, _1, cookie))); }
/** \brief Register a callback function for mouse events
* \param[in] callback the member function that will be registered as a callback for a mouse event
* \param[in] instance instance to the class that implements the callback function
* \param[in] cookie user data that is passed to the callback
* \return a connection object that allows to disconnect the callback function.
*/
template<typename T> inline boost::signals2::connection registerMouseCallback (void (T::*callback) (const cv::MouseEvent&, void*), T& instance, void* cookie = NULL)
{ return (registerMouseCallback (boost::bind (callback, boost::ref (instance), _1, cookie))); }
void registerMouseCallback(void (*callback)(const cv::MouseEvent&, void*), void* cookie = 0);
void spin ();
void spinOnce (int time = 1, bool force_redraw = false);