Commit 9d38de38 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

fixed compile error and warning

parent 4d30d09b
...@@ -9,6 +9,7 @@ namespace cv{ ...@@ -9,6 +9,7 @@ namespace cv{
public: public:
TrackingFunctionPF(const Mat& chosenRect); TrackingFunctionPF(const Mat& chosenRect);
void update(const Mat& image); void update(const Mat& image);
int getDims() const { return 4; }
double calc(const double* x) const; double calc(const double* x) const;
void correctParams(double* pt)const; void correctParams(double* pt)const;
private: private:
......
...@@ -254,7 +254,7 @@ TWeight GCGraph<TWeight>::maxFlow() ...@@ -254,7 +254,7 @@ TWeight GCGraph<TWeight>::maxFlow()
minWeight = MIN(minWeight, weight); minWeight = MIN(minWeight, weight);
CV_Assert( minWeight > 0 ); CV_Assert( minWeight > 0 );
} }
weight = abs( TWeight(v->weight) ); weight = std::abs( TWeight(v->weight) );
minWeight = MIN(minWeight, weight); minWeight = MIN(minWeight, weight);
CV_Assert( minWeight > 0 ); CV_Assert( minWeight > 0 );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment