1 files changed, 33 insertions, 33 deletions

diff --git a/tracker-pt/module/frame.cpp b/tracker-pt/module/frame.cpp
index e403af07..1a276f16 100644
--- a/tracker-pt/module/frame.cpp
+++ b/tracker-pt/module/frame.cpp
@@ -1,48 +1,54 @@
 #include "frame.hpp"
-
 #include "compat/math.hpp"
-
-#include <cstring>
-#include <tuple>
-
 #include <opencv2/imgproc.hpp>
 
-using namespace pt_module;
+namespace pt_module {
 
-Preview& Preview::operator=(const pt_frame& frame_)
+void Preview::set_last_frame(const pt_frame& frame_)
 {
     const cv::Mat& frame = frame_.as_const<const Frame>()->mat;
-    ensure_size(frame_copy, frame_out.cols, frame_out.rows, CV_8UC3);
+    const bool need_resize = frame.size != frame_copy.size;
 
-    if (frame.channels() != 3)
+    if (frame.channels() == 1)
     {
-        once_only(qDebug() << "tracker/pt: camera frame depth: 3 !=" << frame.channels());
-        return *this;
+        if (need_resize)
+        {
+            frame_tmp.create(frame.size(), CV_8UC3);
+            cv::cvtColor(frame, frame_tmp, cv::COLOR_GRAY2BGR);
+            cv::resize(frame_tmp, frame_copy, frame_copy.size(), 0, 0, cv::INTER_NEAREST);
+        }
+        else
+            cv::cvtColor(frame, frame_copy, cv::COLOR_GRAY2BGR);
+    }
+    else if (frame.channels() == 3)
+    {
+        if (need_resize)
+            cv::resize(frame, frame_copy, frame_copy.size(), 0, 0, cv::INTER_NEAREST);
+        else
+            frame.copyTo(frame_copy);
     }
-
-    const bool need_resize = frame.cols != frame_out.cols || frame.rows != frame_out.rows;
-    if (need_resize)
-        cv::resize(frame, frame_copy, cv::Size(frame_out.cols, frame_out.rows), 0, 0, cv::INTER_NEAREST);
     else
-        frame.copyTo(frame_copy);
-
-    return *this;
+    {
+        eval_once(qDebug() << "tracker/pt: camera frame depth" << frame.channels() << "!= 3");
+        frame_copy.create(frame_copy.size(), CV_8UC3);
+        frame_copy.setTo({0});
+    }
 }
 
 Preview::Preview(int w, int h)
 {
-    ensure_size(frame_out, w, h, CV_8UC4);
-
-    frame_out.setTo(cv::Scalar(0, 0, 0, 0));
+    frame_out.create(h, w, CV_8UC4);
+    frame_copy.create(h, w, CV_8UC3);
+    frame_copy.setTo({0});
 }
 
 QImage Preview::get_bitmap()
 {
-    int stride = frame_out.step.p[0];
+    int stride = (int)frame_out.step.p[0];
 
-    if (stride < 64 || stride < frame_out.cols * 4)
+    if (stride < frame_out.cols * 4)
     {
-        once_only(qDebug() << "bad stride" << stride
+        eval_once(qDebug() << "bad stride" << stride
                            << "for bitmap size" << frame_copy.cols << frame_copy.rows);
         return QImage();
     }
@@ -55,11 +61,9 @@ QImage Preview::get_bitmap()
                   QImage::Format_ARGB32);
 }
 
-void Preview::draw_head_center(double x, double y)
+void Preview::draw_head_center(f x, f y)
 {
-    double px_, py_;
-
-    std::tie(px_, py_) = to_pixel_pos(x, y, frame_copy.cols, frame_copy.rows);
+    auto [px_, py_] = to_pixel_pos(x, y, frame_copy.cols, frame_copy.rows);
 
     int px = iround(px_), py = iround(py_);
 
@@ -76,8 +80,4 @@ void Preview::draw_head_center(double x, double y)
              color, 1);
 }
 
-void Preview::ensure_size(cv::Mat& frame, int w, int h, int type)
-{
-    if (frame.cols != w || frame.rows != h)
-        frame = cv::Mat(h, w, type);
-}
+} // ns pt_module