2 files changed, 0 insertions, 204 deletions
diff --git a/cv/video-widget.cpp b/cv/video-widget.cpp
deleted file mode 100644
index f2da8da7..00000000
--- a/cv/video-widget.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-/* Copyright (c) 2012 Patrick Ruoff
- * Copyright (c) 2014-2016 Stanislaw Halik <sthalik@misaki.pl>
- *
- * 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.
- */
-
-// XXX TODO remove hard opencv dependency -sh 20190210
-
-#include "video-widget.hpp"
-#include "compat/check-visible.hpp"
-#include "compat/math.hpp"
-
-#include <cstddef>
-#include <cstring>
-#include <opencv2/imgproc.hpp>
-
-cv_video_widget::cv_video_widget(QWidget* parent) : QWidget(parent)
-{
-    texture = QImage(width(), height(), QImage::Format_ARGB32);
-    texture.fill(Qt::gray);
-    texture.setDevicePixelRatio(devicePixelRatioF());
-
-    connect(&timer, SIGNAL(timeout()), this, SLOT(update_and_repaint()), Qt::DirectConnection);
-    timer.start(65);
-}
-
-void cv_video_widget::update_image(const cv::Mat& frame)
-{
-    QMutexLocker l(&mtx);
-
-    if (texture.width() != W || texture.height() != H)
-    {
-        frame2 = cv::Mat();
-        frame3 = cv::Mat();
-    }
-
-    if (!freshp)
-    {
-        if (W < 1 || H < 1 || frame.rows < 1 || frame.cols < 1)
-            return;
-
-        freshp = true;
-
-        if (frame2.cols != frame.cols || frame2.rows != frame.rows)
-            frame2 = cv::Mat(frame.rows, frame.cols, CV_8UC4);
-
-        if (frame3.cols != W || frame3.rows != H)
-            frame3 = cv::Mat(H, W, CV_8UC4);
-
-        const cv::Mat* argb = &frame2;
-
-        switch (frame.channels())
-        {
-        case 1:
-            cv::cvtColor(frame, frame2, cv::COLOR_GRAY2BGRA);
-            break;
-        case 3:
-            cv::cvtColor(frame, frame2, cv::COLOR_BGR2BGRA);
-            break;
-        case 4:
-            argb = &frame;
-            break;
-        default:
-            unreachable();
-        }
-
-        const cv::Mat* img;
-
-        if (argb->cols != W || argb->rows != H)
-        {
-            cv::resize(*argb, frame3, cv::Size(W, H), 0, 0, cv::INTER_NEAREST);
-            img = &frame3;
-        }
-        else
-            img = argb;
-
-        int stride = (int)img->step.p[0];
-
-        if (stride < img->cols)
-            std::abort();
-
-        unsigned nbytes = (unsigned)(4 * img->rows * stride);
-        vec.resize(nbytes); vec.shrink_to_fit();
-        std::memcpy(vec.data(), img->data, nbytes);
-
-        texture = QImage((const unsigned char*) vec.data(), W, H, stride, QImage::Format_ARGB32);
-        texture.setDevicePixelRatio(devicePixelRatioF());
-    }
-}
-
-void cv_video_widget::update_image(const QImage& img)
-{
-    QMutexLocker l(&mtx);
-
-    if (freshp)
-        return;
-    freshp = true;
-
-    unsigned nbytes = unsigned(img.bytesPerLine() * img.height());
-    vec.resize(nbytes); vec.shrink_to_fit();
-    std::memcpy(vec.data(), img.constBits(), nbytes);
-
-    texture = QImage((const unsigned char*) vec.data(), img.width(), img.height(), img.bytesPerLine(), img.format());
-    texture.setDevicePixelRatio(devicePixelRatioF());
-}
-
-void cv_video_widget::paintEvent(QPaintEvent*)
-{
-    QMutexLocker foo(&mtx);
-    QPainter painter(this);
-
-    double dpr = devicePixelRatioF();
-    W = iround(width() * dpr);
-    H = iround(height() * dpr);
-
-    painter.drawImage(rect(), texture);
-
-    if (texture.width() != W || texture.height() != H)
-    {
-        texture = QImage(W, H, QImage::Format_ARGB32);
-        texture.fill(Qt::gray);
-        texture.setDevicePixelRatio(dpr);
-    }
-}
-
-void cv_video_widget::update_and_repaint()
-{
-    if (!check_is_visible())
-        return;
-
-    QMutexLocker l(&mtx);
-
-    if (freshp)
-    {
-        freshp = false;
-        repaint();
-    }
-}
-
-void cv_video_widget::resizeEvent(QResizeEvent*)
-{
-    QMutexLocker l(&mtx);
-    W = iround(width() * devicePixelRatioF());
-    H = iround(height() * devicePixelRatioF());
-}
-
-void cv_video_widget::get_preview_size(int& w, int& h)
-{
-    QMutexLocker l(&mtx);
-    w = W; h = H;
-}
diff --git a/cv/video-widget.hpp b/cv/video-widget.hpp
deleted file mode 100644
index cad05a20..00000000
--- a/cv/video-widget.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/* Copyright (c) 2012 Patrick Ruoff
- * Copyright (c) 2014-2016 Stanislaw Halik <sthalik@misaki.pl>
- *
- * 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.
- */
-
-#pragma once
-
-#include "compat/math.hpp"
-
-#include <memory>
-#include <vector>
-
-#include <opencv2/core.hpp>
-
-#include <QObject>
-#include <QWidget>
-#include <QPainter>
-#include <QtEvents>
-#include <QTimer>
-#include <QMutex>
-#include <QMutexLocker>
-#include <QSize>
-#include <QDebug>
-
-class cv_video_widget final : public QWidget
-{
-    Q_OBJECT
-
-public:
-    cv_video_widget(QWidget *parent);
-    void update_image(const cv::Mat& frame);
-    void update_image(const QImage& image);
-    void get_preview_size(int& w, int& h);
-    void resizeEvent(QResizeEvent*) override;
-private slots:
-    void paintEvent(QPaintEvent*) override;
-    void update_and_repaint();
-private:
-    QMutex mtx { QMutex::Recursive };
-    QImage texture;
-    std::vector<unsigned char> vec;
-    QTimer timer;
-    cv::Mat frame2, frame3;
-    bool freshp = false;
-
-    int W  = iround(QWidget::width() * devicePixelRatioF());
-    int H = iround(QWidget::height() * devicePixelRatioF());
-};