diff --git a/modules/ximgproc/include/opencv2/ximgproc/weighted_median_filter.hpp b/modules/ximgproc/include/opencv2/ximgproc/weighted_median_filter.hpp
index 30a169cd8..d3da29efd 100644
--- a/modules/ximgproc/include/opencv2/ximgproc/weighted_median_filter.hpp
+++ b/modules/ximgproc/include/opencv2/ximgproc/weighted_median_filter.hpp
@@ -63,12 +63,12 @@ namespace ximgproc
 */
 enum WMFWeightType
 {
-    WMF_EXP, //!< \f$exp(-|I1-I2|^2/(2*sigma^2))\f$
-    WMF_IV1, //!< \f$(|I1-I2|+sigma)^-1\f$
-    WMF_IV2, //!< \f$(|I1-I2|^2+sigma^2)^-1\f$
-    WMF_COS, //!< \f$dot(I1,I2)/(|I1|*|I2|)\f$
-    WMF_JAC, //!< \f$(min(r1,r2)+min(g1,g2)+min(b1,b2))/(max(r1,r2)+max(g1,g2)+max(b1,b2))\f$
-    WMF_OFF //!< unweighted
+    WMF_EXP = 1     , //!< \f$exp(-|I1-I2|^2/(2*sigma^2))\f$
+    WMF_IV1 = 1 << 1, //!< \f$(|I1-I2|+sigma)^-1\f$
+    WMF_IV2 = 1 << 2, //!< \f$(|I1-I2|^2+sigma^2)^-1\f$
+    WMF_COS = 1 << 3, //!< \f$dot(I1,I2)/(|I1|*|I2|)\f$
+    WMF_JAC = 1 << 4, //!< \f$(min(r1,r2)+min(g1,g2)+min(b1,b2))/(max(r1,r2)+max(g1,g2)+max(b1,b2))\f$
+    WMF_OFF = 1 << 5  //!< unweighted
 };
 
 /**
@@ -87,7 +87,8 @@ enum WMFWeightType
 *
 * @sa medianBlur, jointBilateralFilter
 */
-CV_EXPORTS void weightedMedianFilter(InputArray joint, InputArray src, OutputArray dst, int r, double sigma=25.5, WMFWeightType weightType=WMF_EXP, Mat mask=Mat());
+CV_EXPORTS_W void weightedMedianFilter(InputArray joint, InputArray src, OutputArray dst,
+                                       int r, double sigma = 25.5, int weightType = WMF_EXP, InputArray mask = noArray());
 }
 }
 
diff --git a/modules/ximgproc/src/weighted_median_filter.cpp b/modules/ximgproc/src/weighted_median_filter.cpp
index 358959cdd..92db2e453 100644
--- a/modules/ximgproc/src/weighted_median_filter.cpp
+++ b/modules/ximgproc/src/weighted_median_filter.cpp
@@ -231,7 +231,7 @@ inline void updateBCB(int &num,int *f,int *b,int i,int v)
  *                If F is 3-channel, perform k-means clustering
  *                If F is 1-channel, only perform type-casting
  ***************************************************************/
-void featureIndexing(Mat &F, float **&wMap, int &nF, float sigmaI, WMFWeightType weightType){
+void featureIndexing(Mat &F, float **&wMap, int &nF, float sigmaI, int weightType){
     // Configuration and Declaration
     Mat FNew;
     int cols = F.cols, rows = F.rows;
@@ -636,7 +636,7 @@ namespace cv
 {
 namespace ximgproc
 {
-void weightedMedianFilter(InputArray joint, InputArray src, OutputArray dst, int r, double sigma, WMFWeightType weightType, Mat mask)
+void weightedMedianFilter(InputArray joint, InputArray src, OutputArray dst, int r, double sigma, int weightType, InputArray mask)
 {
     CV_Assert(!src.empty());
     CV_Assert(r > 0 && sigma > 0);
@@ -697,7 +697,7 @@ void weightedMedianFilter(InputArray joint, InputArray src, OutputArray dst, int
     //Filtering - Joint-Histogram Framework
     for(int i=0; i<(int)Is.size(); i++)
     {
-        Is[i] = filterCore(Is[i], F, wMap, r, nF,nI,mask);
+        Is[i] = filterCore(Is[i], F, wMap, r, nF, nI, mask.getMat());
     }
     float2D_release(wMap);