Merge pull request #680 from Algomorph:master

9 years ago · fc763bfa1c
parent eada22052c 395db9e721
commit fc763bfa1c
2 changed files with 2 additions and 2 deletions
--- a/modules/tracking/include/opencv2/tracking/onlineMIL.hpp
+++ b/modules/tracking/include/opencv2/tracking/onlineMIL.hpp
@ -54,8 +54,6 @@ namespace cv
 //TODO based on the original implementation
 //http://vision.ucsd.edu/~bbabenko/project_miltrack.shtml

-#define  sign(s)  ((s > 0 ) ? 1 : ((s<0) ? -1 : 0))
-
 class ClfOnlineStump;

 class CV_EXPORTS ClfMilBoost
--- a/modules/tracking/src/onlineMIL.cpp
+++ b/modules/tracking/src/onlineMIL.cpp
@ -42,6 +42,8 @@
 #include "precomp.hpp"
 #include "opencv2/tracking/onlineMIL.hpp"

+#define  sign(s)  ((s > 0 ) ? 1 : ((s<0) ? -1 : 0))
+
 template<class T> class SortableElementRev
 {
 public: