Fix scale initialization

Without this, estimation of tracked object scale doesn't work
correctly.

This should have been done in commit 495214a ("Move scale and
async_res variables to ThreadCtx", 2018-09-12).

diff --git a/src/kcf.cpp b/src/kcf.cpp
index d06322d6af5ec8f061ff6acf091f4cecce428d11..0caf99ccc3c66d8842e9e47209ad63430f547d28 100644 (file)
--- a/src/kcf.cpp
+++ b/src/kcf.cpp
@@ -178,9 +178,9 @@ void KCF_Tracker::init(cv::Mat &img, const cv::Rect &bbox, int fit_size_x, int f
     int max = m_use_big_batch ? 2 : p_num_scales;
     for (int i = 0; i < max; ++i) {
         if (m_use_big_batch && i == 1)
-            p_threadctxs.emplace_back(p_windows_size, p_cell_size, p_num_of_feats * p_num_scales, p_num_scales);
+            p_threadctxs.emplace_back(p_windows_size, p_cell_size, p_num_of_feats * p_num_scales, 1, p_num_scales);
         else
-            p_threadctxs.emplace_back(p_windows_size, p_cell_size, p_num_of_feats, 1);
+            p_threadctxs.emplace_back(p_windows_size, p_cell_size, p_num_of_feats, p_scales[i], 1);
     }
 
     p_current_scale = 1.;

diff --git a/src/threadctx.hpp b/src/threadctx.hpp
index c4bb5356484925b34a5871ba6e134bd69812ff86..9ad333429c497da944210f292825021ea1dfe270 100644 (file)
--- a/src/threadctx.hpp
+++ b/src/threadctx.hpp
@@ -16,7 +16,7 @@ typedef int *cudaStream_t;
 
 struct ThreadCtx {
   public:
-    ThreadCtx(cv::Size windows_size, uint cell_size, uint num_of_feats, double scale, uint num_of_scales = 1)
+    ThreadCtx(cv::Size windows_size, uint cell_size, uint num_of_feats, double scale, uint num_of_scales)
         : scale(scale)
     {
         this->xf_sqr_norm = DynMem(num_of_scales * sizeof(float));