diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2021-09-04 21:58:05 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-04 21:58:05 +0000 |
| commit | 51b1792dde92c1896686c016be6b96d6c0c23d70 (patch) | |
| tree | f94fa68f995c42e72ff8ac68493abe8464bf8a02 | |
| parent | a854e76e68b7e6db837ca890641c01db8f250686 (diff) | |
| parent | a31c8b933d6444f92ac36b08c6688b25a46ce79a (diff) | |
Merge pull request #1327 from DaWelter/master
Fix video capture on linux and mac as well as init of QCheckBox
| -rw-r--r-- | pose-widget/pose-widget.hpp | 2 | ||||
| -rw-r--r-- | video-opencv/impl-camera.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pose-widget/pose-widget.hpp b/pose-widget/pose-widget.hpp index 49044d93..a866f958 100644 --- a/pose-widget/pose-widget.hpp +++ b/pose-widget/pose-widget.hpp @@ -27,7 +27,7 @@ public: pose_widget(QWidget *parent = nullptr); void present(double xAngle, double yAngle, double zAngle, double x, double y, double z); QSize sizeHint() const override; - QCheckBox mirror{QCheckBox{"Mirror", this}}; + QCheckBox mirror{"Mirror", this}; private: void resizeEvent(QResizeEvent *event) override; void paintEvent(QPaintEvent*) override; diff --git a/video-opencv/impl-camera.cpp b/video-opencv/impl-camera.cpp index 7e357d7c..662eceb2 100644 --- a/video-opencv/impl-camera.cpp +++ b/video-opencv/impl-camera.cpp @@ -33,7 +33,7 @@ bool cam::is_open() bool cam::start(info& args) { stop(); - cap.emplace(idx, cv::CAP_DSHOW); + cap.emplace(idx, video_capture_backend); if (args.width > 0 && args.height > 0) { |