From 24284d3d17ed223a757323e4be3049e899d5e65c Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Tue, 15 Dec 2015 17:51:08 +0300 Subject: [PATCH] [move sift.cpp] Fixed HAL headers location original commit: https://github.com/opencv/opencv_contrib/commit/f529a1df2b17bcada1179ddcaf1352e3a5ba97b8 --- modules/features2d/src/sift.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/modules/features2d/src/sift.cpp b/modules/features2d/src/sift.cpp index 53f9ccba16..9c3d2117b7 100644 --- a/modules/features2d/src/sift.cpp +++ b/modules/features2d/src/sift.cpp @@ -72,6 +72,7 @@ #include "precomp.hpp" #include #include +#include namespace cv { @@ -302,9 +303,9 @@ static float calcOrientationHist( const Mat& img, Point pt, int radius, len = k; // compute gradient values, orientations and the weights over the pixel neighborhood - hal::exp(W, W, len); - hal::fastAtan2(Y, X, Ori, len, true); - hal::magnitude(X, Y, Mag, len); + cv::hal::exp32f(W, W, len); + cv::hal::fastAtan2(Y, X, Ori, len, true); + cv::hal::magnitude32f(X, Y, Mag, len); for( k = 0; k < len; k++ ) { @@ -585,9 +586,9 @@ static void calcSIFTDescriptor( const Mat& img, Point2f ptf, float ori, float sc } len = k; - hal::fastAtan2(Y, X, Ori, len, true); - hal::magnitude(X, Y, Mag, len); - hal::exp(W, W, len); + cv::hal::fastAtan2(Y, X, Ori, len, true); + cv::hal::magnitude32f(X, Y, Mag, len); + cv::hal::exp32f(W, W, len); for( k = 0; k < len; k++ ) {