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

Merge pull request #10412 from GregoryMorse:patch-2

Update to add window position and size retrieval to HighGUI (#10412)

* Update highgui.hpp

Add read only property retrieval for enhanced rendering capabilities and more sophisticated research tools

* Update window.cpp

* Update window_w32.cpp

* Update window_QT.cpp

* Update window_QT.h

* Update window_QT.h

* Update window_gtk.cpp

* Update precomp.hpp

* Update highgui_c.h

* Update highgui_c.h

* Update window_w32.cpp

* Update precomp.hpp

* Update window_QT.cpp

* Update window_QT.h

* Update window_gtk.cpp

* Update window_gtk.cpp

* Update window_w32.cpp

* Update window_QT.cpp

* Update window_carbon.cpp

* Update window_cocoa.mm

* Update precomp.hpp

* Update window_cocoa.mm

* Update window_w32.cpp

* Update window_gtk.cpp

* Update window_QT.cpp

* Update window_gtk.cpp

* Update window_QT.cpp

* Update window_cocoa.mm

* Update window_carbon.cpp

* Update window_w32.cpp

* Update window_cocoa.mm

* Update window_gtk.cpp

* Update window_cocoa.mm

* Update window_gtk.cpp

* Update window_cocoa.mm

* Update window_cocoa.mm

* Update window.cpp

* Update test_gui.cpp

* Update test_gui.cpp

* Update test_gui.cpp

* Update highgui_c.h

* Update highgui.hpp

* Update window.cpp

* Update highgui_c.h

* Update test_gui.cpp

* Update highgui.hpp

* Update window.cpp

* Update window.cpp

* Update window.cpp

* Update window.cpp

* Update window.cpp
This commit is contained in:
Gregory Morse
2018-01-18 05:49:47 +01:00
committed by Alexander Alekhin
parent f056e713c3
commit ec353dbdda
11 changed files with 235 additions and 3 deletions
+26 -1
View File
@@ -160,12 +160,37 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
return -1;
#endif
break;
default:
return -1;
}
}
cv::Rect cvGetWindowImageRect(const char* name)
{
if (!name)
return cv::Rect(-1, -1, -1, -1);
#if defined (HAVE_QT)
return cvGetWindowRect_QT(name);
#elif defined(HAVE_WIN32UI)
return cvGetWindowRect_W32(name);
#elif defined (HAVE_GTK)
return cvGetWindowRect_GTK(name);
#elif defined (HAVE_CARBON)
return cvGetWindowRect_CARBON(name);
#elif defined (HAVE_COCOA)
return cvGetWindowRect_COCOA(name);
#else
return cv::Rect(-1, -1, -1, -1);
#endif
}
cv::Rect cv::getWindowImageRect(const String& winname)
{
CV_TRACE_FUNCTION();
return cvGetWindowImageRect(winname.c_str());
}
void cv::namedWindow( const String& winname, int flags )
{
CV_TRACE_FUNCTION();