From 0ac31a0bd76ab51f83a12fa5ece00e3ab3d18f90 Mon Sep 17 00:00:00 2001 From: Pavel Rojtberg Date: Thu, 24 Mar 2016 23:58:47 +0100 Subject: [PATCH] highgui: add CV_GUI_* flags to enum in cpp so they appear in bindings --- modules/highgui/include/opencv2/highgui.hpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/highgui/include/opencv2/highgui.hpp b/modules/highgui/include/opencv2/highgui.hpp index 41bd8af..9a2c8c8 100644 --- a/modules/highgui/include/opencv2/highgui.hpp +++ b/modules/highgui/include/opencv2/highgui.hpp @@ -182,8 +182,10 @@ enum WindowFlags { WINDOW_FULLSCREEN = 1, //!< change the window to fullscreen. WINDOW_FREERATIO = 0x00000100, //!< the image expends as much as it can (no ratio constraint). - WINDOW_KEEPRATIO = 0x00000000 //!< the ratio of the image is respected. - }; + WINDOW_KEEPRATIO = 0x00000000, //!< the ratio of the image is respected. + WINDOW_GUI_EXPANDED=0x00000000, //!< status bar and tool bar + WINDOW_GUI_NORMAL = 0x00000010, //!< old fashious way + }; //! Flags for cv::setWindowProperty / cv::getWindowProperty enum WindowPropertyFlags { @@ -287,9 +289,9 @@ Qt backend supports additional flags: displayed image (see imshow ), and you cannot change the window size manually. - **WINDOW_FREERATIO or WINDOW_KEEPRATIO:** WINDOW_FREERATIO adjusts the image with no respect to its ratio, whereas WINDOW_KEEPRATIO keeps the image ratio. - - **CV_GUI_NORMAL or CV_GUI_EXPANDED:** CV_GUI_NORMAL is the old way to draw the window - without statusbar and toolbar, whereas CV_GUI_EXPANDED is a new enhanced GUI. -By default, flags == WINDOW_AUTOSIZE | WINDOW_KEEPRATIO | CV_GUI_EXPANDED + - **WINDOW_GUI_NORMAL or WINDOW_GUI_EXPANDED:** WINDOW_GUI_NORMAL is the old way to draw the window + without statusbar and toolbar, whereas WINDOW_GUI_EXPANDED is a new enhanced GUI. +By default, flags == WINDOW_AUTOSIZE | WINDOW_KEEPRATIO | WINDOW_GUI_EXPANDED @param winname Name of the window in the window caption that may be used as a window identifier. @param flags Flags of the window. The supported flags are: (cv::WindowFlags) -- 2.7.4