-
Notifications
You must be signed in to change notification settings - Fork 6.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* [OpenCV] update to 4.5.2 * update version refs * [OpenCV4] fix qt integration * fix refs
- Loading branch information
Showing
19 changed files
with
138 additions
and
64 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt | ||
| index a31d969..fa779e4 100644 | ||
| index 3a79631..b8ac4d5 100644 | ||
| --- a/modules/videoio/CMakeLists.txt | ||
| +++ b/modules/videoio/CMakeLists.txt | ||
| @@ -1,3 +1,4 @@ | ||
| +cmake_minimum_required(VERSION 3.3) | ||
| set(VIDEOIO_PLUGIN_LIST "" CACHE STRING "List of videoio backends to be compiled as plugins (ffmpeg, gstreamer, mfx, msmf or special value 'all')") | ||
| set(VIDEOIO_ENABLE_PLUGINS "ON" CACHE BOOL "Allow building videoio plugin support") | ||
| set(VIDEOIO_ENABLE_STRICT_PLUGIN_CHECK "ON" CACHE BOOL "Make sure OpenCV version is the same in plugin and host code") | ||
| mark_as_advanced(VIDEOIO_PLUGIN_LIST VIDEOIO_ENABLE_PLUGINS) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| From f479935cda5eb38a4a4a9e909b6f4f82a0c7533d Mon Sep 17 00:00:00 2001 | ||
| From: Christoph Rackwitz <christoph.rackwitz@gmail.com> | ||
| Date: Thu, 8 Apr 2021 12:59:06 +0200 | ||
| Subject: [PATCH] fix for #19870 | ||
|
|
||
| HAVE_QT and HAVE_WIN32UI can both be true at the same time | ||
| if HAVE_QT, window_w32.cpp is not included in the build, see CMakeLists.txt | ||
| --- | ||
| modules/highgui/src/window.cpp | 8 ++++++-- | ||
| 1 file changed, 6 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/modules/highgui/src/window.cpp b/modules/highgui/src/window.cpp | ||
| index 406871b7e8f8..d2cf1e1e4826 100644 | ||
| --- a/modules/highgui/src/window.cpp | ||
| +++ b/modules/highgui/src/window.cpp | ||
| @@ -93,7 +93,9 @@ CV_IMPL void cvSetWindowProperty(const char* name, int prop_id, double prop_valu | ||
| break; | ||
|
|
||
| case cv::WND_PROP_VSYNC: | ||
| - #if defined (HAVE_WIN32UI) | ||
| + #if defined (HAVE_QT) | ||
| + // nothing | ||
| + #elif defined (HAVE_WIN32UI) | ||
| cvSetPropVsync_W32(name, (prop_value != 0)); | ||
| #else | ||
| // not implemented yet for other toolkits | ||
| @@ -191,7 +193,9 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id) | ||
| break; | ||
|
|
||
| case cv::WND_PROP_VSYNC: | ||
| - #if defined (HAVE_WIN32UI) | ||
| + #if defined (HAVE_QT) | ||
| + return -1; | ||
| + #elif defined (HAVE_WIN32UI) | ||
| return cvGetPropVsync_W32(name); | ||
| #else | ||
| return -1; |
Oops, something went wrong.