mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-01 06:49:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20980 from alalek:highgui_fix_cvGetWindowImageRect_3.4

Browse Source
This commit is contained in:
Alexander Alekhin 2021-10-30 13:59:08 +00:00
commit bce76a7977
2 changed files with 1 additions and 5 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

@ -135,11 +135,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 );

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

@ -191,6 +191,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id)
} }
} }
static
cv::Rect cvGetWindowImageRect(const char* name) cv::Rect cvGetWindowImageRect(const char* name)
{ {
if (!name) if (!name)