Fix sign() macro redefinition compile-time error

Algomorph · Algomorph · commit 395db9e7211d · 2016-05-23T13:00:28.000-04:00
diff --git 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
diff --git 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:

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@`
`42`	`42`	`#include "precomp.hpp"`
`43`	`43`	`#include "opencv2/tracking/onlineMIL.hpp"`
`44`	`44`
	`45`	`+#define sign(s) ((s > 0 ) ? 1 : ((s<0) ? -1 : 0))`
	`46`	`+`
`45`	`47`	`template<class T> class SortableElementRev`
`46`	`48`	`{`
`47`	`49`	`public:`