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

Merge pull request #9445 from adishavit:master

Browse Source 
* Adds cv::resizeWindow() overload taking a single cv::Size argument.

* Replaces copied documentaion with Doxygen @overload command.
This commit is contained in:
Adi Shavit 2017-08-25 14:37:50 +03:00 committed by Alexander Alekhin
parent bee5cb504b
commit 8a094a5f54
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/highgui/include/opencv2/highgui.hpp
View File

@ -401,6 +401,12 @@ CV_EXPORTS_W void imshow(const String& winname, InputArray mat);
*/ */
CV_EXPORTS_W void resizeWindow(const String& winname, int width, int height); CV_EXPORTS_W void resizeWindow(const String& winname, int width, int height);
/** @overload
@param winname Window name.
@param size The new window size.
*/
CV_EXPORTS_W void resizeWindow(const String& winname, const cv::Size& size);
/** @brief Moves window to the specified position /** @brief Moves window to the specified position
@param winname Name of the window. @param winname Name of the window.

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

@ -190,6 +190,12 @@ void cv::resizeWindow( const String& winname, int width, int height )
cvResizeWindow( winname.c_str(), width, height ); cvResizeWindow( winname.c_str(), width, height );
} }
void cv::resizeWindow(const String& winname, const cv::Size& size)
{
CV_TRACE_FUNCTION();
cvResizeWindow(winname.c_str(), size.width, size.height);
}
void cv::moveWindow( const String& winname, int x, int y ) void cv::moveWindow( const String& winname, int x, int y )
{ {
CV_TRACE_FUNCTION(); CV_TRACE_FUNCTION();

2
samples/cpp/tutorial_code/features2D/AKAZE_tracking/planar_tracking.cpp
View File

@ -155,7 +155,7 @@ int main(int argc, char **argv)
Mat frame; Mat frame;
video_in >> frame; video_in >> frame;
namedWindow(video_name, WINDOW_NORMAL); namedWindow(video_name, WINDOW_NORMAL);
cv::resizeWindow(video_name, frame.cols, frame.rows); cv::resizeWindow(video_name, frame.size());
cout << "Please select a bounding box, and press any key to continue." << endl; cout << "Please select a bounding box, and press any key to continue." << endl;
vector<Point2f> bb; vector<Point2f> bb;