Merge pull request #1796 from cv3d:cleanup/python/enums

modules/xfeatures2d/misc/python/pyopencv_xfeatures2d.hpp

@@ -4,7 +4,4 @@
 using cv::xfeatures2d::DAISY;
 
 typedef DAISY::NormalizationType DAISY_NormalizationType;
-
-CV_PY_FROM_ENUM(DAISY::NormalizationType);
-CV_PY_TO_ENUM(DAISY::NormalizationType);
 #endif

modules/ximgproc/include/opencv2/ximgproc/slic.hpp

@@ -61,7 +61,7 @@ namespace ximgproc
 //! @addtogroup ximgproc_superpixel
 //! @{
 
-    enum SLIC { SLIC = 100, SLICO = 101, MSLIC = 102 };
+    enum SLICType { SLIC = 100, SLICO = 101, MSLIC = 102 };
 
 /** @brief Class implementing the SLIC (Simple Linear Iterative Clustering) superpixels
 algorithm described in @cite Achanta2012.