From 395db9e7211d58473beafa6a9643d3cd49ad4eb4 Mon Sep 17 00:00:00 2001 From: Gregory Kramida Date: Mon, 23 May 2016 12:56:39 -0400 Subject: [PATCH] Fix sign() macro redefinition compile-time error --- modules/tracking/include/opencv2/tracking/onlineMIL.hpp | 2 -- modules/tracking/src/onlineMIL.cpp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tracking/include/opencv2/tracking/onlineMIL.hpp b/modules/tracking/include/opencv2/tracking/onlineMIL.hpp index b6fc25b0c..78e1372f8 100644 --- 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 index 4fcfb548f..29fa9fe34 100644 --- 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 SortableElementRev { public: