1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

This commit is contained in:
Alexander Alekhin
2018-11-26 15:37:45 +03:00
20 changed files with 596 additions and 535 deletions
+2
View File
@@ -152,6 +152,8 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
case CV_WND_PROP_VISIBLE:
#if defined (HAVE_QT)
return cvGetPropVisible_QT(name);
#elif defined(HAVE_WIN32UI)
return cvGetPropVisible_W32(name);
#else
return -1;
#endif