Fix binary compatibility of Java wrappers

modules/imgproc/include/opencv2/imgproc/imgproc.hpp

@@ -636,10 +636,10 @@ CV_EXPORTS_W void accumulateWeighted( InputArray src, InputOutputArray dst,
 //! computes PSNR image/video quality metric
 CV_EXPORTS_W double PSNR(InputArray src1, InputArray src2);
 
-CV_EXPORTS Point2d phaseCorrelate(InputArray src1, InputArray src2,
-                                  InputArray window = noArray());
 CV_EXPORTS_W Point2d phaseCorrelate(InputArray src1, InputArray src2,
-                                    InputArray window, CV_OUT double* response CV_WRAP_DEFAULT(0));
+                                  InputArray window = noArray());
+CV_EXPORTS_W Point2d phaseCorrelateRes(InputArray src1, InputArray src2,
+                                    InputArray window, CV_OUT double* response = 0);
 CV_EXPORTS_W void createHanningWindow(OutputArray dst, Size winSize, int type);
 
 //! type of the threshold operation

modules/imgproc/src/phasecorr.cpp

@@ -488,7 +488,7 @@ static Point2d weightedCentroid(InputArray _src, cv::Point peakLocation, cv::Siz
 
 }
 
-cv::Point2d cv::phaseCorrelate(InputArray _src1, InputArray _src2, InputArray _window, double* response)
+cv::Point2d cv::phaseCorrelateRes(InputArray _src1, InputArray _src2, InputArray _window, double* response)
 {
     Mat src1 = _src1.getMat();
     Mat src2 = _src2.getMat();
@@ -570,7 +570,7 @@ cv::Point2d cv::phaseCorrelate(InputArray _src1, InputArray _src2, InputArray _w
 
 cv::Point2d cv::phaseCorrelate(InputArray _src1, InputArray _src2, InputArray _window)
 {
-    return phaseCorrelate(_src1, _src2, _window, 0);
+    return phaseCorrelateRes(_src1, _src2, _window, 0);
 }
 
 void cv::createHanningWindow(OutputArray _dst, cv::Size winSize, int type)

modules/java/generator/src/cpp/features2d_manual.hpp

@@ -37,6 +37,7 @@ public:
 
 
         GRIDDETECTOR = 1000,
+        GRIDRETECTOR = 1000,
 
         GRID_FAST          = GRIDDETECTOR + FAST,
         GRID_STAR          = GRIDDETECTOR + STAR,