From 2999e68abb5f63fa6fb4634010e6577dbe8aa74d Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 25 Jan 2018 14:14:08 +0100
Subject: cv: no fork anymore

Changes were merged to mainline OpenCV.
---
 cv/video-property-page.cpp | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'cv')

diff --git a/cv/video-property-page.cpp b/cv/video-property-page.cpp
index 80395c79..a711e6af 100644
--- a/cv/video-property-page.cpp
+++ b/cv/video-property-page.cpp
@@ -50,21 +50,7 @@ prop_settings_worker::prop_settings_worker(int idx)
 {
     int ret = cap.get(cv::CAP_PROP_SETTINGS);
 
-    if (ret < 0)
-        run_in_thread_async(qApp, []() {
-            QMessageBox msg;
-            msg.setTextFormat(Qt::RichText);
-            msg.setWindowTitle("Camera properties");
-
-            static const char* uri = "https://github.com/opentrack/opencv/tree/fork";
-
-            msg.setText(QString("<p>Must use the opencv fork.</p>"
-                                "<p>See &lt;<a href='%1'>%1</a>&gt;</p>").arg(uri));
-            msg.setStandardButtons(QMessageBox::Cancel);
-            msg.setIcon(QMessageBox::Warning);
-            msg.exec();
-        });
-    else if (ret > 0)
+    if (ret != 0)
         run_in_thread_async(qApp, []() {
             QMessageBox::warning(nullptr,
                                  "Camera properties",
-- 
cgit v1.2.3