From 9d38de38b2d26734cfc948108c33c3c2cdc22dd5 Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Tue, 5 May 2015 18:56:45 +0300
Subject: [PATCH] fixed compile error and warning

---
 modules/tracking/src/TrackingFunctionPF.hpp | 1 +
 modules/xphoto/src/gcgraph.hpp              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/tracking/src/TrackingFunctionPF.hpp b/modules/tracking/src/TrackingFunctionPF.hpp
index 5b5461ae7..0f7b66e56 100644
--- a/modules/tracking/src/TrackingFunctionPF.hpp
+++ b/modules/tracking/src/TrackingFunctionPF.hpp
@@ -9,6 +9,7 @@ namespace cv{
         public:
             TrackingFunctionPF(const Mat& chosenRect);
             void update(const Mat& image);
+            int getDims() const { return 4; }
             double calc(const double* x) const;
             void correctParams(double* pt)const;
         private:
diff --git a/modules/xphoto/src/gcgraph.hpp b/modules/xphoto/src/gcgraph.hpp
index 639373085..513e9c2d1 100644
--- a/modules/xphoto/src/gcgraph.hpp
+++ b/modules/xphoto/src/gcgraph.hpp
@@ -254,7 +254,7 @@ TWeight GCGraph<TWeight>::maxFlow()
                 minWeight = MIN(minWeight, weight);
                 CV_Assert( minWeight > 0 );
             }
-            weight = abs( TWeight(v->weight) );
+            weight = std::abs( TWeight(v->weight) );
             minWeight = MIN(minWeight, weight);
             CV_Assert( minWeight > 0 );
         }