Merge pull request #680 from Algomorph:master

fc763bfa · Alexander Alekhin · eada2205 · 395db9e7 · fc763bfa · fc763bfa
Commit fc763bfa authored May 23, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

onlineMIL.hpp modules/tracking/include/opencv2/tracking/onlineMIL.hpp +0 -2

onlineMIL.cpp modules/tracking/src/onlineMIL.cpp +2 -0

No files found.
--- 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: