[opencv] Remove protobuf dependency for UWP

This commit is contained in:
Robert Schumacher 2017-09-22 19:42:01 -07:00
parent e79c36cb8d
commit b9f2d7b618
2 changed files with 2 additions and 15 deletions

View File

@ -24,16 +24,3 @@ index c8242dd..97edd14 100644
# 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/highgui/src/window.cpp b/modules/highgui/src/window.cpp
index 9306f8e..69a814e 100644
--- a/modules/highgui/src/window.cpp
+++ b/modules/highgui/src/window.cpp
@@ -209,7 +209,7 @@ int cv::waitKeyEx(int delay)
int cv::waitKey(int delay)
{
int code = waitKeyEx(delay);
-#ifndef HAVE_WINRT
+#ifndef WINRT
static int use_legacy = -1;
if (use_legacy < 0)
{

View File

@ -1,5 +1,5 @@
Source: opencv
Version: 3.3.0-2
Version: 3.3.0-3
# Optional: Add in vtk to build with VTK and cuda to build with CUDA
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf, ffmpeg
Build-Depends: zlib, libpng, libjpeg-turbo, tiff, protobuf (windows), ffmpeg
Description: computer vision library