diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-11-05 10:24:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-05 10:24:02 -0800 |
| commit | df4773c05614eb19084ae4db1fbc1bb3295d3ec6 (patch) | |
| tree | 082b4584f62164b3492b22c01ab7110eb403eeda /ports/opencv3/0009-fix-uwp.patch | |
| parent | e8bb299bbb8e393922a48d0b3137d61c8e4b80ed (diff) | |
| download | vcpkg-df4773c05614eb19084ae4db1fbc1bb3295d3ec6.tar.gz vcpkg-df4773c05614eb19084ae4db1fbc1bb3295d3ec6.zip | |
Revert "[opencv3] Upgrade to version 3.4.8 (#8623)" (#8911)
This reverts commit df266bd06716f1599d13eaf6e306c8de85fbaca9.
Diffstat (limited to 'ports/opencv3/0009-fix-uwp.patch')
| -rw-r--r-- | ports/opencv3/0009-fix-uwp.patch | 55 |
1 files changed, 39 insertions, 16 deletions
diff --git a/ports/opencv3/0009-fix-uwp.patch b/ports/opencv3/0009-fix-uwp.patch index f28eee278..cba3963dc 100644 --- a/ports/opencv3/0009-fix-uwp.patch +++ b/ports/opencv3/0009-fix-uwp.patch @@ -1,16 +1,29 @@ diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake -index 8b1267d..f67c2c2 100644 +index c2fda8f..3f7dfdc 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake -@@ -1162,7 +1162,7 @@ function(ocv_add_perf_tests) - set_target_properties(${the_target} PROPERTIES FOLDER "tests performance") - endif() +@@ -850,7 +850,7 @@ macro(ocv_create_module) + set(the_module_target ${the_module}) + endif() -- if(WINRT) -+ if(WINRT AND BUILD_TESTS) - # removing APPCONTAINER from tests to run from console - # look for detailed description inside of ocv_create_module macro above - add_custom_command(TARGET "opencv_perf_${name}" +- if(WINRT) ++ if(WINRT AND BUILD_TESTS) + # removing APPCONTAINER from modules to run from console + # in case of usual starting of WinRT test apps output is missing + # so starting of console version w/o APPCONTAINER is required to get test results +diff --git a/modules/core/src/utils/datafile.cpp b/modules/core/src/utils/datafile.cpp +index f1107b0..c613ca2 100644 +--- a/modules/core/src/utils/datafile.cpp ++++ b/modules/core/src/utils/datafile.cpp +@@ -108,7 +108,7 @@ static cv::String getModuleLocation(const void* addr) + CV_UNUSED(addr); + #ifdef _WIN32 + HMODULE m = 0; +-#if _WIN32_WINNT >= 0x0501 ++#if (_WIN32_WINNT >= 0x0501) && (!WINRT_STORE) + ::GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, + reinterpret_cast<LPCTSTR>(addr), + &m); diff --git a/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp b/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp index f4147f3..b92efdd 100644 --- a/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp @@ -35,10 +48,20 @@ index 25f4aef..5429f0b 100644 using namespace Windows::UI::Xaml::Controls; -diff --git a/cmake/platforms/OpenCV-WindowsStore.cmake b/cmake/platforms/OpenCV-WindowsStore.cmake -index 8b5dfa5..efc8b4f 100644 ---- a/cmake/platforms/OpenCV-WindowsStore.cmake -+++ b/cmake/platforms/OpenCV-WindowsStore.cmake -@@ -1 +1 @@ --include("${CMAKE_CURRENT_LIST_DIR}/OpenCV_WinRT.cmake") -+include("${CMAKE_CURRENT_LIST_DIR}/OpenCV-WinRT.cmake") +diff --git a/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp b/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp +index 236e227..e2417dc 100644 +--- a/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp ++++ b/modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp +@@ -94,10 +94,10 @@ Media::CaptureFrameGrabber::~CaptureFrameGrabber() + + void Media::CaptureFrameGrabber::ShowCameraSettings() + { +-#if WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP ++#if (WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP) && (WINAPI_FAMILY!=WINAPI_FAMILY_APP) + if (_state == State::Started) + { +- CameraOptionsUI::Show(_capture.Get()); ++ CameraOptionsUI::Show(_capture.Get()); // TODO: Turn it on again in UWP mode by adding reference to UWP Desktop Extensions + } + #endif + } |