Commit c810d03d authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

some more attempts to fix compile bug on Android

parent c3748a5f
...@@ -235,7 +235,8 @@ float ShapeContextDistanceExtractorImpl::computeDistance(InputArray contour1, In ...@@ -235,7 +235,8 @@ float ShapeContextDistanceExtractorImpl::computeDistance(InputArray contour1, In
set2SCE.extractSCD(set2, set2SCD, inliers2, set1SCE.getMeanDistance()); set2SCE.extractSCD(set2, set2SCD, inliers2, set1SCE.getMeanDistance());
// regularization parameter with annealing rate annRate // // regularization parameter with annealing rate annRate //
beta=std::pow(set1SCE.getMeanDistance(),2); beta=set1SCE.getMeanDistance();
beta *= beta;
// match // // match //
matcher.matchDescriptors(set1SCD, set2SCD, matches, comparer, inliers1, inliers2); matcher.matchDescriptors(set1SCD, set2SCD, matches, comparer, inliers1, inliers2);
...@@ -284,13 +285,12 @@ float ShapeContextDistanceExtractorImpl::computeDistance(InputArray contour1, In ...@@ -284,13 +285,12 @@ float ShapeContextDistanceExtractorImpl::computeDistance(InputArray contour1, In
gaussWindow = Mat::zeros(warpedImage.rows, warpedImage.cols, CV_32F); gaussWindow = Mat::zeros(warpedImage.rows, warpedImage.cols, CV_32F);
for (pt=0; pt<sset1.cols; pt++) for (pt=0; pt<sset1.cols; pt++)
{ {
Point2f p = sset1.at<Point2f>(0,pt);
for (ii=0; ii<diffIm.rows; ii++) for (ii=0; ii<diffIm.rows; ii++)
{ {
for (jj=0; jj<diffIm.cols; jj++) for (jj=0; jj<diffIm.cols; jj++)
{ {
float xx = sset1.at<Point2f>(0,pt).x; float val = float(std::exp( -float( (p.x-jj)*(p.x-jj) + (p.y-ii)*(p.y-ii) )/(2*sigma*sigma) ) / (sigma*sigma*2*CV_PI));
float yy = sset1.at<Point2f>(0,pt).y;
float val = float(std::exp( -float( (xx-jj)*(xx-jj) + (yy-ii)*(yy-ii) )/(2*sigma*sigma) ) / (sigma*sigma*2*CV_PI));
gaussWindow.at<float>(ii,jj) += val; gaussWindow.at<float>(ii,jj) += val;
} }
} }
......
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