potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

highgui: drop invalid cvGetWindowImageRect

Browse Source
This commit is contained in:
Alexander Alekhin
2021-10-30 10:57:47 +00:00
parent 017a4e7c30
commit 66f3e97457
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/src/window.cpp
+8 -14
View File
@@ -399,13 +399,13 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
#endif
}
cv::Rect cvGetWindowImageRect(const char* name)
cv::Rect cv::getWindowImageRect(const String& winname)
{
CV_TRACE_FUNCTION();
CV_Assert(name);
CV_Assert(!winname.empty());
{
auto window = findWindow_(name);
auto window = findWindow_(winname);
if (window)
{
return window->getImageRect();
@@ -416,7 +416,7 @@ cv::Rect cvGetWindowImageRect(const char* name)
auto backend = getCurrentUIBackend();
if (backend)
{
CV_LOG_WARNING(NULL, "Can't find window with name: '" << name << "'. Do nothing");
CV_LOG_WARNING(NULL, "Can't find window with name: '" << winname << "'. Do nothing");
CV_NOT_FOUND_DEPRECATION;
}
else
@@ -427,13 +427,13 @@ cv::Rect cvGetWindowImageRect(const char* name)
#else
#if defined (HAVE_QT)
return cvGetWindowRect_QT(name);
return cvGetWindowRect_QT(winname.c_str());
#elif defined(HAVE_WIN32UI)
return cvGetWindowRect_W32(name);
return cvGetWindowRect_W32(winname.c_str());
#elif defined (HAVE_GTK)
return cvGetWindowRect_GTK(name);
return cvGetWindowRect_GTK(winname.c_str());
#elif defined (HAVE_COCOA)
return cvGetWindowRect_COCOA(name);
return cvGetWindowRect_COCOA(winname.c_str());
#else
return Rect(-1, -1, -1, -1);
#endif
@@ -441,12 +441,6 @@ cv::Rect cvGetWindowImageRect(const char* name)
#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();