summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-07-20 13:25:05 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-07-20 13:25:05 +0200
commitfa58baa2bb84fe51a6b835c72a92a7a9050cbf73 (patch)
tree7d1cb9c3ebd795b17a4807b15726da94ccbe60dc
parent3d78a3cb97ed470f331c5cdf7a3f3b2714a92f78 (diff)
cleanup invalid recursive mutex acquisitions
-rw-r--r--ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
index ef680ff4..40262893 100644
--- a/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
+++ b/ftnoir_tracker_pt/ftnoir_tracker_pt_dialog.cpp
@@ -90,10 +90,7 @@ TrackerDialog_PT::TrackerDialog_PT()
void TrackerDialog_PT::camera_settings()
{
if (tracker)
- {
- QMutexLocker l(&tracker->camera_mtx);
open_camera_settings(static_cast<cv::VideoCapture*>(tracker->camera), s.camera_name, &tracker->camera_mtx);
- }
else
open_camera_settings(nullptr, s.camera_name, nullptr);
}
@@ -129,7 +126,6 @@ void TrackerDialog_PT::poll_tracker_info()
QString to_print;
CamInfo info;
{
- QMutexLocker l(&tracker->camera_mtx);
// display caminfo
tracker->get_cam_info(&info);
to_print = QString::number(info.res_x)+"x"+QString::number(info.res_y)+" @ "+QString::number(info.fps)+" FPS";