Fix sign() macro redefinition compile-time error

pull/680/head
Gregory Kramida 9 years ago
parent eada22052c
commit 395db9e721
  1. 2
      modules/tracking/include/opencv2/tracking/onlineMIL.hpp
  2. 2
      modules/tracking/src/onlineMIL.cpp

@ -54,8 +54,6 @@ namespace cv
//TODO based on the original implementation //TODO based on the original implementation
//http://vision.ucsd.edu/~bbabenko/project_miltrack.shtml //http://vision.ucsd.edu/~bbabenko/project_miltrack.shtml
#define sign(s) ((s > 0 ) ? 1 : ((s<0) ? -1 : 0))
class ClfOnlineStump; class ClfOnlineStump;
class CV_EXPORTS ClfMilBoost class CV_EXPORTS ClfMilBoost

@ -42,6 +42,8 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "opencv2/tracking/onlineMIL.hpp" #include "opencv2/tracking/onlineMIL.hpp"
#define sign(s) ((s > 0 ) ? 1 : ((s<0) ? -1 : 0))
template<class T> class SortableElementRev template<class T> class SortableElementRev
{ {
public: public:

Loading…
Cancel
Save