From 5fdf8b92e78b2a5690ba0e9642c0d68d8b2e4495 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sat, 27 Apr 2013 18:52:37 +0200 Subject: Fix embarassing locking but propagated through the codebase :( --- ftnoir_tracker_pt/video_widget.cpp | 7 ++----- ftnoir_tracker_pt/video_widget.h | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'ftnoir_tracker_pt') diff --git a/ftnoir_tracker_pt/video_widget.cpp b/ftnoir_tracker_pt/video_widget.cpp index e6d1e24c..a13542ba 100644 --- a/ftnoir_tracker_pt/video_widget.cpp +++ b/ftnoir_tracker_pt/video_widget.cpp @@ -14,7 +14,7 @@ using namespace std; void VideoWidget::update_image(Mat frame, std::auto_ptr< vector >) { - QMutexLocker((QMutex*)&mtx); + QMutexLocker foo(&mtx); if (frame.channels() != 3 && frame.channels() != 1) return; @@ -47,9 +47,6 @@ void VideoWidget::update_image(Mat frame, std::auto_ptr< vector >) data[y * pitch + x * 3 + 2] = src[pos]; } } - if (qframe.size() == size() || (qframe.width() <= this->width() && qframe.height() <= this->height())) { - } - else - qframe = qframe.scaled(size(), Qt::IgnoreAspectRatio, Qt::FastTransformation); + qframe = qframe.scaled(size(), Qt::IgnoreAspectRatio, Qt::FastTransformation); pixmap = QPixmap::fromImage(qframe); } diff --git a/ftnoir_tracker_pt/video_widget.h b/ftnoir_tracker_pt/video_widget.h index 57be8bff..769e9d45 100644 --- a/ftnoir_tracker_pt/video_widget.h +++ b/ftnoir_tracker_pt/video_widget.h @@ -29,7 +29,7 @@ public: void update_image(cv::Mat frame, std::auto_ptr< std::vector >); protected slots: void paintEvent( QPaintEvent* e ) { - QMutexLocker((QMutex*)&mtx); + QMutexLocker foo(&mtx); QPainter painter(this); painter.drawPixmap(e->rect(), pixmap); } -- cgit v1.2.3