Skip to content

O
opencv_contrib
Commit 94d1b9bc authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #2316 from alalek:core_tls_handle_thread_termination

parents 7899b499 3e4fb8f4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
modules/xfeatures2d/src/sift.cpp
View file @ 94d1b9bc
...@@ -107,6 +107,8 @@ ...@@ -107,6 +107,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
{ {
namespace xfeatures2d namespace xfeatures2d
...@@ -709,7 +711,7 @@ void SIFT_Impl::findScaleSpaceExtrema( const std::vector<Mat>& gauss_pyr, const ...@@ -709,7 +711,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++ )
......
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