Skip to content

O
opencv_contrib
Unverified Commit 9e190bcd authored by Alexander Alekhin's avatar Alexander Alekhin Committed by GitHub
Browse files
Options

Merge pull request #2024 from alalek:backport_bindings_generator

parents 536f6a93 1756e82b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
modules/aruco/include/opencv2/aruco/dictionary.hpp
View file @ 9e190bcd
...@@ -138,7 +138,7 @@ class CV_EXPORTS_W Dictionary { ...@@ -138,7 +138,7 @@ class CV_EXPORTS_W Dictionary {
* - DICT_ARUCO_ORIGINAL: standard ArUco Library Markers. 1024 markers, 5x5 bits, 0 minimum * - DICT_ARUCO_ORIGINAL: standard ArUco Library Markers. 1024 markers, 5x5 bits, 0 minimum
distance distance
*/ */
enum CV_EXPORTS_W_SIMPLE PREDEFINED_DICTIONARY_NAME { enum PREDEFINED_DICTIONARY_NAME {
DICT_4X4_50 = 0, DICT_4X4_50 = 0,
DICT_4X4_100, DICT_4X4_100,
DICT_4X4_250, DICT_4X4_250,
......
modules/ximgproc/include/opencv2/ximgproc/slic.hpp
View file @ 9e190bcd
...@@ -62,6 +62,7 @@ namespace ximgproc ...@@ -62,6 +62,7 @@ namespace ximgproc
//! @{ //! @{
enum SLIC { SLIC = 100, SLICO = 101, MSLIC = 102 }; enum SLIC { SLIC = 100, SLICO = 101, MSLIC = 102 };
typedef enum SLIC SLICType;
/** @brief Class implementing the SLIC (Simple Linear Iterative Clustering) superpixels /** @brief Class implementing the SLIC (Simple Linear Iterative Clustering) superpixels
algorithm described in @cite Achanta2012. algorithm described in @cite Achanta2012.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment