Fix embarassing locking but propagated through the codebase :(

3 files changed, 6 insertions, 9 deletions

diff --git a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
index c3ff7fca..10bd4548 100644
--- a/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
+++ b/ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
@@ -111,9 +111,9 @@ static void load_settings(ht_config_t* config, Tracker* tracker)
     config->pyrlk_win_size_w = config->pyrlk_win_size_h = 21;
     config->max_keypoints = 200;
     config->keypoint_quality = 5;
-    config->keypoint_distance = 2;
-    config->keypoint_3distance = 5;
-    config->keypoint_9distance = 12;
+    config->keypoint_distance = 1;
+    config->keypoint_3distance = 4;
+    config->keypoint_9distance = 8;
     //config->force_width = 640;
     //config->force_height = 480;
     config->force_fps = iniFile.value("fps", 0).toInt();
diff --git a/ftnoir_tracker_ht/video_widget.cpp b/ftnoir_tracker_ht/video_widget.cpp
index ac91dd6b..84cba6a3 100644
--- a/ftnoir_tracker_ht/video_widget.cpp
+++ b/ftnoir_tracker_ht/video_widget.cpp
@@ -13,7 +13,7 @@ using namespace std;
 
 void VideoWidget::update_image(unsigned char *frame, int width, int height)
 {
-    QMutexLocker((QMutex*)&mtx);
+    QMutexLocker foo(&mtx);
     QImage qframe = QImage(width, height, QImage::Format_RGB888);
     uchar* data = qframe.bits();
     const int pitch = qframe.bytesPerLine();
@@ -25,9 +25,6 @@ void VideoWidget::update_image(unsigned char *frame, int width, int height)
             data[y * pitch + x * 3 + 1] = frame[pos + 1];
             data[y * pitch + x * 3 + 2] = frame[pos + 0];
         }
-    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_ht/video_widget.h b/ftnoir_tracker_ht/video_widget.h
index 7cccc9fb..0d625d29 100644
--- a/ftnoir_tracker_ht/video_widget.h
+++ b/ftnoir_tracker_ht/video_widget.h
@@ -27,7 +27,7 @@ public:
     void update_image(unsigned char* frame, int width, int height);
 protected slots:
     void paintEvent( QPaintEvent* e ) {
-        QMutexLocker((QMutex*)&mtx);
+        QMutexLocker foo(&mtx);
         QPainter painter(this);
         painter.drawPixmap(e->rect(), pixmap);
     }