From ed5116256884fdb0abef7cf79dbf2949754a510b Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Tue, 16 Oct 2012 14:22:17 +0400 Subject: [PATCH] Fix binary compatibility of Java wrappers --- modules/imgproc/include/opencv2/imgproc/imgproc.hpp | 6 +++--- modules/imgproc/src/phasecorr.cpp | 4 ++-- modules/java/generator/src/cpp/features2d_manual.hpp | 1 + 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/imgproc/include/opencv2/imgproc/imgproc.hpp b/modules/imgproc/include/opencv2/imgproc/imgproc.hpp index ddf40e6..caa2d55 100644 --- a/modules/imgproc/include/opencv2/imgproc/imgproc.hpp +++ b/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 diff --git a/modules/imgproc/src/phasecorr.cpp b/modules/imgproc/src/phasecorr.cpp index dd5497f..87e4d30 100644 --- a/modules/imgproc/src/phasecorr.cpp +++ b/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) diff --git a/modules/java/generator/src/cpp/features2d_manual.hpp b/modules/java/generator/src/cpp/features2d_manual.hpp index ad45fab..1047e2b 100644 --- a/modules/java/generator/src/cpp/features2d_manual.hpp +++ b/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, -- 2.7.4