Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions libuvc_camera/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion libuvc_camera/src/camera_driver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion libuvc_camera/src/nodelet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*********************************************************************/
#include <ros/ros.h>
#include <pluginlib/class_list_macros.h>
#include <pluginlib/class_list_macros.hpp>
#include <nodelet/nodelet.h>

#include "libuvc_camera/camera_driver.h"
Expand Down