mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-10 11:03:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20982 from alalek:highgui_drop_cvGetWindowImageRect_4.x

Browse Source
This commit is contained in:
Alexander Alekhin 2021-10-30 14:01:33 +00:00
commit b65ae3b036
2 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/highgui/include/opencv2/highgui/highgui_c.h
View File

@ -129,11 +129,6 @@ CVAPI(int) cvNamedWindow( const char* name, int flags CV_DEFAULT(CV_WINDOW_AUTOS
CVAPI(void) cvSetWindowProperty(const char* name, int prop_id, double prop_value); CVAPI(void) cvSetWindowProperty(const char* name, int prop_id, double prop_value);
CVAPI(double) cvGetWindowProperty(const char* name, int prop_id); CVAPI(double) cvGetWindowProperty(const char* name, int prop_id);
#ifdef __cplusplus // FIXIT remove in OpenCV 4.0
/* Get window image rectangle coordinates, width and height */
CVAPI(cv::Rect)cvGetWindowImageRect(const char* name);
#endif
/* display image within window (highgui windows remember their content) */ /* display image within window (highgui windows remember their content) */
CVAPI(void) cvShowImage( const char* name, const CvArr* image ); CVAPI(void) cvShowImage( const char* name, const CvArr* image );

22
modules/highgui/src/window.cpp
View File

@ -399,13 +399,13 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
#endif #endif
} }
cv::Rect cvGetWindowImageRect(const char* name) cv::Rect cv::getWindowImageRect(const String& winname)
{ {
CV_TRACE_FUNCTION(); CV_TRACE_FUNCTION();
CV_Assert(name); CV_Assert(!winname.empty());
{ {
auto window = findWindow_(name); auto window = findWindow_(winname);
if (window) if (window)
{ {
return window->getImageRect(); return window->getImageRect();
@ -416,7 +416,7 @@ cv::Rect cvGetWindowImageRect(const char* name)
auto backend = getCurrentUIBackend(); auto backend = getCurrentUIBackend();
if (backend) 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; CV_NOT_FOUND_DEPRECATION;
} }
else else
@ -427,13 +427,13 @@ cv::Rect cvGetWindowImageRect(const char* name)
#else #else
#if defined (HAVE_QT) #if defined (HAVE_QT)
return cvGetWindowRect_QT(name); return cvGetWindowRect_QT(winname.c_str());
#elif defined(HAVE_WIN32UI) #elif defined(HAVE_WIN32UI)
return cvGetWindowRect_W32(name); return cvGetWindowRect_W32(winname.c_str());
#elif defined (HAVE_GTK) #elif defined (HAVE_GTK)
return cvGetWindowRect_GTK(name); return cvGetWindowRect_GTK(winname.c_str());
#elif defined (HAVE_COCOA) #elif defined (HAVE_COCOA)
return cvGetWindowRect_COCOA(name); return cvGetWindowRect_COCOA(winname.c_str());
#else #else
return Rect(-1, -1, -1, -1); return Rect(-1, -1, -1, -1);
#endif #endif
@ -441,12 +441,6 @@ cv::Rect cvGetWindowImageRect(const char* name)
#endif #endif
} }
cv::Rect cv::getWindowImageRect(const String& winname)
{
CV_TRACE_FUNCTION();
return cvGetWindowImageRect(winname.c_str());
}
void cv::namedWindow( const String& winname, int flags ) void cv::namedWindow( const String& winname, int flags )
{ {
CV_TRACE_FUNCTION(); CV_TRACE_FUNCTION();