Skip to content

Apply #509 and #526 to Noetic Branch #528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JWhitleyWork merged 2 commits into from
May 13, 2020
Merged

Apply #509 and #526 to Noetic Branch #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
069c811
Fix import path on camera_calibrator.py (#509)
G-Pereira Mar 30, 2020
60581da
clone cv_ptr->image before set queued_image (#526)
k-okada May 6, 2020
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
2 changes: 1 addition & 1 deletion camera_calibration/src/camera_calibration/camera_calibrator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
from queue import Queue
except ImportError:
from Queue import Queue
from calibrator import CAMERA_MODEL
from camera_calibration.calibrator import CAMERA_MODEL

class BufferQueue(Queue):
"""Slight modification of the standard Queue that discards the oldest item
Expand Down
2 changes: 1 addition & 1 deletion image_view/src/nodelets/image_nodelet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ void ImageNodelet::imageCb(const sensor_msgs::ImageConstPtr& msg)
options.max_image_value = max_image_value_;
}
cv_ptr = cvtColorForDisplay(cv_bridge::toCvShare(msg), "", options);
queued_image_.set(cv_ptr->image);
queued_image_.set(cv_ptr->image.clone());
}
catch (cv_bridge::Exception& e) {
NODELET_ERROR_THROTTLE(30, "Unable to convert '%s' image for display: '%s'",
Expand Down