Skip to content
Snippets Groups Projects
Commit e1886d04 authored by Jason Mercer's avatar Jason Mercer Committed by Ken Tossell
Browse files

Fixed locks so they stay in scope until end of method.

parent c8d1bf5c
No related branches found
No related tags found
No related merge requests found
......@@ -84,7 +84,7 @@ bool CameraDriver::Start() {
}
void CameraDriver::Stop() {
boost::recursive_mutex::scoped_lock(mutex_);
boost::recursive_mutex::scoped_lock lock(mutex_);
assert(state_ != kInitial);
......@@ -100,7 +100,7 @@ void CameraDriver::Stop() {
}
void CameraDriver::ReconfigureCallback(UVCCameraConfig &new_config, uint32_t level) {
boost::recursive_mutex::scoped_lock(mutex_);
boost::recursive_mutex::scoped_lock lock(mutex_);
if ((level & kReconfigureClose) == kReconfigureClose) {
if (state_ == kRunning)
......@@ -167,7 +167,7 @@ void CameraDriver::ImageCallback(uvc_frame_t *frame) {
timestamp = ros::Time::now();
}
boost::recursive_mutex::scoped_lock(mutex_);
boost::recursive_mutex::scoped_lock lock(mutex_);
assert(state_ == kRunning);
assert(rgb_frame_);
......@@ -247,7 +247,7 @@ void CameraDriver::AutoControlsCallback(
int selector,
enum uvc_status_attribute status_attribute,
void *data, size_t data_len) {
boost::recursive_mutex::scoped_lock(mutex_);
boost::recursive_mutex::scoped_lock lock(mutex_);
printf("Controls callback. class: %d, event: %d, selector: %d, attr: %d, data_len: %zu\n",
status_class, event, selector, status_attribute, data_len);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment