Fix clang 3.8 errors/warnings

diff --git a/src/kcf.h b/src/kcf.h
index d6983bb6bb4c4c359fab5a59d8b4712ddacce297..91d9ffd5dbf76657ddc443a3fc5a897f9ab165bd 100644 (file)
--- a/src/kcf.h
+++ b/src/kcf.h
@@ -125,7 +125,7 @@ private:
     double p_min_max_scale[2];
     std::vector<double> p_scales;
 
-    const int p_num_of_feats = 31 + m_use_color ? 3 : 0 + m_use_cnfeat ? 10 : 0;
+    const int p_num_of_feats = 31 + (m_use_color ? 3 : 0) + (m_use_cnfeat ? 10 : 0);
     cv::Size p_roi;
 
     Kcf_Tracker_Private &d;

diff --git a/src/threadctx.hpp b/src/threadctx.hpp
index d1095f262a54c06682b3770f36d1e0b8dfbcff67..891c3db483a9c313d23648a55de1b23232980d7b 100644 (file)
--- a/src/threadctx.hpp
+++ b/src/threadctx.hpp
@@ -49,8 +49,8 @@ public:
     MatDynMem in_all{roi, CV_32F};
 #endif
     MatDynMem fw_all{roi.height * int(num_channels), roi.width, CV_32F};
-    MatDynMem ifft2_res{roi, CV_32FC(num_channels)};
-    MatDynMem response{roi, CV_32FC(num_of_scales)};
+    MatDynMem ifft2_res{roi, CV_32FC(int(num_channels))};
+    MatDynMem response{roi, CV_32FC(int(num_of_scales))};
 
     ComplexMat zf{uint(freq_size.height), uint(freq_size.width), num_channels, num_of_scales};
     ComplexMat kzf{uint(freq_size.height), uint(freq_size.width), num_of_scales};