[move sift.cpp] xfeatures2d: use updated TLS API

original commit: 3e4fb8f415
This commit is contained in:
Alexander Alekhin 2019-10-17 00:44:20 +00:00
parent fd46684bf8
commit fadb90c579

View File

@ -74,6 +74,8 @@
#include <stdarg.h> #include <stdarg.h>
#include <opencv2/core/hal/hal.hpp> #include <opencv2/core/hal/hal.hpp>
#include <opencv2/core/utils/tls.hpp>
namespace cv namespace cv
{ {
@ -672,7 +674,7 @@ void SIFT_Impl::findScaleSpaceExtrema( const std::vector<Mat>& gauss_pyr, const
const int threshold = cvFloor(0.5 * contrastThreshold / nOctaveLayers * 255 * SIFT_FIXPT_SCALE); const int threshold = cvFloor(0.5 * contrastThreshold / nOctaveLayers * 255 * SIFT_FIXPT_SCALE);
keypoints.clear(); keypoints.clear();
TLSData<std::vector<KeyPoint> > tls_kpts_struct; TLSDataAccumulator<std::vector<KeyPoint> > tls_kpts_struct;
for( int o = 0; o < nOctaves; o++ ) for( int o = 0; o < nOctaves; o++ )
for( int i = 1; i <= nOctaveLayers; i++ ) for( int i = 1; i <= nOctaveLayers; i++ )