dos2unix only

1 files changed, 64 insertions, 64 deletions

diff --git a/ftnoir_tracker_pt/pt_video_widget.cpp b/ftnoir_tracker_pt/pt_video_widget.cpp
index 02817cbf..cb3dc48e 100644
--- a/ftnoir_tracker_pt/pt_video_widget.cpp
+++ b/ftnoir_tracker_pt/pt_video_widget.cpp
@@ -1,64 +1,64 @@
-/* Copyright (c) 2012 Patrick Ruoff

- *

- * Permission to use, copy, modify, and/or distribute this software for any

- * purpose with or without fee is hereby granted, provided that the above

- * copyright notice and this permission notice appear in all copies.

- *

- * 20130312, WVR: Add 7 lines to resizeGL after resize_frame. This should lower CPU-load.

- */

-

-#include "pt_video_widget.h"

-

-#include <QDebug>

-#include <QHBoxLayout>

-

-using namespace cv;

-using namespace std;

-

-void PTVideoWidget::update_image(const cv::Mat& frame)

-{

-    QMutexLocker foo(&mtx);

-    _frame = frame.clone();

-    freshp = true;

-}

-

-// ----------------------------------------------------------------------------

-VideoWidgetDialog::VideoWidgetDialog(QWidget *parent, FrameProvider* provider)

-    : QDialog(parent),

-      video_widget(NULL)

-{

-    const int VIDEO_FRAME_WIDTH  = 640;

-    const int VIDEO_FRAME_HEIGHT = 480;

-

-    video_widget = new PTVideoWidget(this, provider);

-

-    QHBoxLayout* layout = new QHBoxLayout();

-    layout->setContentsMargins(0, 0, 0, 0);

-    layout->addWidget(video_widget);

-    if (this->layout()) delete this->layout();

-    setLayout(layout);

-    resize(VIDEO_FRAME_WIDTH, VIDEO_FRAME_HEIGHT);

-}

-

-void PTVideoWidget::update_and_repaint()

-{

-    QMutexLocker foo(&mtx);

-    if (_frame.empty() || !freshp)

-        return;

-    freshp = false;

-    QImage qframe = QImage(_frame.cols, _frame.rows, QImage::Format_RGB888);

-    uchar* data = qframe.bits();

-    const int pitch = qframe.bytesPerLine();

-    for (int y = 0; y < _frame.rows; y++)

-        for (int x = 0; x < _frame.cols; x++)

-        {

-            const auto& elt = _frame.at<Vec3b>(y, x);

-            const cv::Scalar elt2 = static_cast<cv::Scalar>(elt);

-            data[y * pitch + x * 3 + 0] = elt2.val[2];

-            data[y * pitch + x * 3 + 1] = elt2.val[1];

-            data[y * pitch + x * 3 + 2] = elt2.val[0];

-        }

-    qframe = qframe.scaled(size(), Qt::IgnoreAspectRatio, Qt::FastTransformation);

-    texture = qframe;

-    update();

-}

+/* Copyright (c) 2012 Patrick Ruoff
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * 20130312, WVR: Add 7 lines to resizeGL after resize_frame. This should lower CPU-load.
+ */
+
+#include "pt_video_widget.h"
+
+#include <QDebug>
+#include <QHBoxLayout>
+
+using namespace cv;
+using namespace std;
+
+void PTVideoWidget::update_image(const cv::Mat& frame)
+{
+    QMutexLocker foo(&mtx);
+    _frame = frame.clone();
+    freshp = true;
+}
+
+// ----------------------------------------------------------------------------
+VideoWidgetDialog::VideoWidgetDialog(QWidget *parent, FrameProvider* provider)
+    : QDialog(parent),
+      video_widget(NULL)
+{
+    const int VIDEO_FRAME_WIDTH  = 640;
+    const int VIDEO_FRAME_HEIGHT = 480;
+
+    video_widget = new PTVideoWidget(this, provider);
+
+    QHBoxLayout* layout = new QHBoxLayout();
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->addWidget(video_widget);
+    if (this->layout()) delete this->layout();
+    setLayout(layout);
+    resize(VIDEO_FRAME_WIDTH, VIDEO_FRAME_HEIGHT);
+}
+
+void PTVideoWidget::update_and_repaint()
+{
+    QMutexLocker foo(&mtx);
+    if (_frame.empty() || !freshp)
+        return;
+    freshp = false;
+    QImage qframe = QImage(_frame.cols, _frame.rows, QImage::Format_RGB888);
+    uchar* data = qframe.bits();
+    const int pitch = qframe.bytesPerLine();
+    for (int y = 0; y < _frame.rows; y++)
+        for (int x = 0; x < _frame.cols; x++)
+        {
+            const auto& elt = _frame.at<Vec3b>(y, x);
+            const cv::Scalar elt2 = static_cast<cv::Scalar>(elt);
+            data[y * pitch + x * 3 + 0] = elt2.val[2];
+            data[y * pitch + x * 3 + 1] = elt2.val[1];
+            data[y * pitch + x * 3 + 2] = elt2.val[0];
+        }
+    qframe = qframe.scaled(size(), Qt::IgnoreAspectRatio, Qt::FastTransformation);
+    texture = qframe;
+    update();
+}