diff --git a/libuvc_camera/CMakeLists.txt b/libuvc_camera/CMakeLists.txt index 91db504..65b0037 100644 --- a/libuvc_camera/CMakeLists.txt +++ b/libuvc_camera/CMakeLists.txt @@ -9,6 +9,11 @@ generate_dynamic_reconfigure_options(cfg/UVCCamera.cfg) find_package(libuvc REQUIRED) message(STATUS "libuvc ${libuvc_VERSION_MAJOR}.${libuvc_VERSION_MINOR}.${libuvc_VERSION_PATCH}") +# this is needed to get the libuvc libraries in libuvc 0.0.7 +find_package(PkgConfig REQUIRED) +pkg_check_modules(libuvc REQUIRED libuvc) +message(STATUS "libuvc libraries ${libuvc_LIBRARIES}") + catkin_package( CATKIN_DEPENDS roscpp diff --git a/libuvc_camera/src/camera_driver.cpp b/libuvc_camera/src/camera_driver.cpp index aa4abce..4ea508e 100644 --- a/libuvc_camera/src/camera_driver.cpp +++ b/libuvc_camera/src/camera_driver.cpp @@ -78,7 +78,8 @@ bool CameraDriver::Start() { state_ = kStopped; - config_server_.setCallback(boost::bind(&CameraDriver::ReconfigureCallback, this, _1, _2)); + config_server_.setCallback(boost::bind(&CameraDriver::ReconfigureCallback, this, + boost::placeholders::_1, boost::placeholders::_2)); return state_ == kRunning; } diff --git a/libuvc_camera/src/nodelet.cpp b/libuvc_camera/src/nodelet.cpp index 91d2f3c..38246d8 100644 --- a/libuvc_camera/src/nodelet.cpp +++ b/libuvc_camera/src/nodelet.cpp @@ -32,7 +32,7 @@ * POSSIBILITY OF SUCH DAMAGE. *********************************************************************/ #include -#include +#include #include #include "libuvc_camera/camera_driver.h"