Merge pull request #225 from vpisarev/core_fixes_part_1

fixed compile error and warning
pull/227/head
Vadim Pisarevsky 10 years ago
commit 0acab5db2d
  1. 1
      modules/tracking/src/TrackingFunctionPF.hpp
  2. 2
      modules/xphoto/src/gcgraph.hpp

@ -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()
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 );
} }

Loading…
Cancel
Save