Skip to content

Commit 987bb2c

Browse files
vicromsalalek
authored andcommitted
Fix build for UWP
backport of commit: f18cbd0
1 parent 960bb54 commit 987bb2c

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

cmake/OpenCVModule.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ macro(ocv_create_module)
850850
set(the_module_target ${the_module})
851851
endif()
852852

853-
if(WINRT)
853+
if(WINRT AND BUILD_TESTS)
854854
# removing APPCONTAINER from modules to run from console
855855
# in case of usual starting of WinRT test apps output is missing
856856
# so starting of console version w/o APPCONTAINER is required to get test results

modules/core/src/utils/datafile.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static cv::String getModuleLocation(const void* addr)
108108
CV_UNUSED(addr);
109109
#ifdef _WIN32
110110
HMODULE m = 0;
111-
#if _WIN32_WINNT >= 0x0501
111+
#if _WIN32_WINNT >= 0x0501 && (!defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP))
112112
::GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
113113
reinterpret_cast<LPCTSTR>(addr),
114114
&m);

modules/videoio/src/cap_ffmpeg.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static cv::Mutex _icvInitFFMPEG_mutex;
8080
static const HMODULE cv_GetCurrentModule()
8181
{
8282
HMODULE h = 0;
83-
#if _WIN32_WINNT >= 0x0501
83+
#if _WIN32_WINNT >= 0x0501 && (!defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP))
8484
::GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT,
8585
reinterpret_cast<LPCTSTR>(cv_GetCurrentModule),
8686
&h);

modules/videoio/src/cap_winrt/CaptureFrameGrabber.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Media::CaptureFrameGrabber::~CaptureFrameGrabber()
9494

9595
void Media::CaptureFrameGrabber::ShowCameraSettings()
9696
{
97-
#if WINAPI_FAMILY!=WINAPI_FAMILY_PHONE_APP
97+
#if (WINAPI_FAMILY != WINAPI_FAMILY_PHONE_APP) && (WINAPI_FAMILY != WINAPI_FAMILY_PC_APP)
9898
if (_state == State::Started)
9999
{
100100
CameraOptionsUI::Show(_capture.Get());

0 commit comments

Comments
 (0)