From 0ee61d178f79d9d679af6b34eda1009cdf1415c1 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Sat, 30 Oct 2021 10:51:52 +0000 Subject: [PATCH] highgui: drop invalid cvGetWindowImageRect - return type is C++ template - removal from 'extern "C"' scope broke ABI anyway, so this symbols is removed completelly --- modules/highgui/include/opencv2/highgui/highgui_c.h | 5 ----- modules/highgui/src/window.cpp | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/highgui/include/opencv2/highgui/highgui_c.h b/modules/highgui/include/opencv2/highgui/highgui_c.h index 35413139c7..d8323d0d93 100644 --- a/modules/highgui/include/opencv2/highgui/highgui_c.h +++ b/modules/highgui/include/opencv2/highgui/highgui_c.h @@ -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(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) */ CVAPI(void) cvShowImage( const char* name, const CvArr* image ); diff --git a/modules/highgui/src/window.cpp b/modules/highgui/src/window.cpp index 877d6751c9..cfe58a0277 100644 --- a/modules/highgui/src/window.cpp +++ b/modules/highgui/src/window.cpp @@ -191,6 +191,7 @@ CV_IMPL double cvGetWindowProperty(const char* name, int prop_id) } } +static cv::Rect cvGetWindowImageRect(const char* name) { if (!name)