Merge pull request Smorodov#253 from Nuzhny007/master

Fix OpenCV 3 compatible
G01project · Oct 11, 2020 · f11025e · f11025e
2 parents b7fe89c + a322489
commit f11025e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/Detector/OCVDNNDetector.h b/src/Detector/OCVDNNDetector.h
@@ -39,7 +39,7 @@ class OCVDNNDetector : public BaseDetector
 	bool m_swapRB = false;
     float m_maxCropRatio = 2.0f;
     std::vector<std::string> m_classNames;
-    std::vector<std::string> m_outNames;
+    std::vector<cv::String> m_outNames;
 	std::vector<int> m_outLayers;
 	std::string m_outLayerType;
     cv::UMat m_inputBlob;

diff --git a/src/Tracker/Kalman.cpp b/src/Tracker/Kalman.cpp
@@ -10,10 +10,10 @@ TKalmanFilter::TKalmanFilter(
         track_t accelNoiseMag
         )
     :
+      m_accelNoiseMag(accelNoiseMag),
       m_deltaTime(deltaTime),
       m_deltaTimeMin(deltaTime),
       m_deltaTimeMax(2 * deltaTime),
-      m_accelNoiseMag(accelNoiseMag),
       m_type(type),
       m_useAcceleration(useAcceleration)
 {

diff --git a/src/Tracker/dat/dat_tracker.cpp b/src/Tracker/dat/dat_tracker.cpp
@@ -160,7 +160,7 @@ cv::RotatedRect DAT_TRACKER::Update(const cv::Mat &im, float& confidence)
         candidate_scores.push_back(vote_scores[i] * dist_scores[i]);
     }
     auto maxEl = std::max_element(candidate_scores.begin(), candidate_scores.end());
-    int best_candidate = maxEl - candidate_scores.begin();
+    size_t best_candidate = maxEl - candidate_scores.begin();
     confidence = *maxEl;
 
     target_pos = candidate_centers[best_candidate];