diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-25 14:14:08 +0100 | 
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2018-01-25 14:14:08 +0100 | 
| commit | 2999e68abb5f63fa6fb4634010e6577dbe8aa74d (patch) | |
| tree | 4e01ad199c6177ee4c6e3a7e06855a0a336fcafc /cv | |
| parent | 96988d34f573087a4b7359b8358d081ee1f8a5ba (diff) | |
cv: no fork anymore
Changes were merged to mainline OpenCV.
Diffstat (limited to 'cv')
| -rw-r--r-- | cv/video-property-page.cpp | 16 | 
1 files changed, 1 insertions, 15 deletions
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 <<a href='%1'>%1</a>></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",  | 
