Merge pull request opencv#9445 from adishavit:master

adishavit · alalek · commit 8a094a5f54fa · 2017-08-25T11:37:50.000Z
* Adds cv::resizeWindow() overload taking a single cv::Size argument. * Replaces copied documentaion with Doxygen @overload command.
diff --git a/modules/highgui/include/opencv2/highgui.hpp b/modules/highgui/include/opencv2/highgui.hpp
@@ -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);
 
+/** @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
 
 @param winname Name of the window.
diff --git a/modules/highgui/src/window.cpp b/modules/highgui/src/window.cpp
@@ -190,6 +190,12 @@ void cv::resizeWindow( const String& winname, int width, int 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 )
 {
     CV_TRACE_FUNCTION();
diff --git a/samples/cpp/tutorial_code/features2D/AKAZE_tracking/planar_tracking.cpp b/samples/cpp/tutorial_code/features2D/AKAZE_tracking/planar_tracking.cpp
@@ -155,7 +155,7 @@ int main(int argc, char **argv)
     Mat frame;
     video_in >> frame;
     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;
     vector<Point2f> bb;

Original file line number	Diff line number	Diff line change
`@@ -190,6 +190,12 @@ void cv::resizeWindow( const String& winname, int width, int height )`
`190`	`190`	`cvResizeWindow( winname.c_str(), width, height );`
`191`	`191`	`}`
`192`	`192`
	`193`	`+void cv::resizeWindow(const String& winname, const cv::Size& size)`
	`194`	`+{`
	`195`	`+ CV_TRACE_FUNCTION();`
	`196`	`+ cvResizeWindow(winname.c_str(), size.width, size.height);`
	`197`	`+}`
	`198`	`+`
`193`	`199`	`void cv::moveWindow( const String& winname, int x, int y )`
`194`	`200`	`{`
`195`	`201`	`CV_TRACE_FUNCTION();`