fixed build errors on Linux + fixed Farneback optical flow sample

diff --git a/modules/ts/src/ts_func.cpp b/modules/ts/src/ts_func.cpp
index f238059..5ad45f1 100644 (file)
--- a/modules/ts/src/ts_func.cpp
+++ b/modules/ts/src/ts_func.cpp
@@ -1631,7 +1631,7 @@ void compare(const Mat& src, double value, Mat& dst, int cmpop)
 }
 
     
-template<typename _Tp> static double
+template<typename _Tp> double
 cmpUlpsInt_(const _Tp* src1, const _Tp* src2, size_t total, int imaxdiff,
            size_t startidx, size_t& idx)
 {
@@ -1651,7 +1651,7 @@ cmpUlpsInt_(const _Tp* src1, const _Tp* src2, size_t total, int imaxdiff,
 }
 
     
-template<> static double cmpUlpsInt_<int>(const int* src1, const int* src2,
+template<> double cmpUlpsInt_<int>(const int* src1, const int* src2,
                                           size_t total, int imaxdiff,
                                           size_t startidx, size_t& idx)
 {
@@ -1671,17 +1671,17 @@ template<> static double cmpUlpsInt_<int>(const int* src1, const int* src2,
 }    
     
 
-template<typename _Tp> static double
-cmpUlpsFlt_(const _Tp* src1, const _Tp* src2, size_t total, int imaxdiff, size_t startidx, size_t& idx)
+static double
+cmpUlpsFlt_(const int* src1, const int* src2, size_t total, int imaxdiff, size_t startidx, size_t& idx)
 {
-    const _Tp C = ((_Tp)1 << (sizeof(_Tp)*8-1)) - 1;
-    _Tp realmaxdiff = 0;
+    const int C = 0x7fffffff;
+    int realmaxdiff = 0;
     size_t i;
     for( i = 0; i < total; i++ )
     {
-        _Tp a = src1[i], b = src2[i];
+        int a = src1[i], b = src2[i];
         if( a < 0 ) a ^= C; if( b < 0 ) b ^= C;
-        _Tp diff = std::abs(a - b);
+        int diff = std::abs(a - b);
         if( realmaxdiff < diff )
         {
             realmaxdiff = diff;
@@ -1692,6 +1692,27 @@ cmpUlpsFlt_(const _Tp* src1, const _Tp* src2, size_t total, int imaxdiff, size_t
     return realmaxdiff;
 }
     
+
+static double
+cmpUlpsFlt_(const int64* src1, const int64* src2, size_t total, int imaxdiff, size_t startidx, size_t& idx)
+{
+    const int64 C = CV_BIG_INT(0x7fffffffffffffff);
+    double realmaxdiff = 0;
+    size_t i;
+    for( i = 0; i < total; i++ )
+    {
+        int64 a = src1[i], b = src2[i];
+        if( a < 0 ) a ^= C; if( b < 0 ) b ^= C;
+        double diff = fabs((double)a - (double)b);
+        if( realmaxdiff < diff )
+        {
+            realmaxdiff = diff;
+            if( diff > imaxdiff && idx == 0 )
+                idx = i + startidx;
+        }
+    }
+    return realmaxdiff;
+}
     
 bool cmpUlps(const Mat& src1, const Mat& src2, int imaxDiff, double* _realmaxdiff, vector<int>* loc)
 {

diff --git a/samples/cpp/fback.cpp b/samples/cpp/fback.cpp
index 5c9a6cc..688d052 100644 (file)
--- a/samples/cpp/fback.cpp
+++ b/samples/cpp/fback.cpp
@@ -46,7 +46,7 @@ int main(int, char**)
         
         if( prevgray.data )
         {
-            (prevgray, gray, flow, 0.5, 3, 15, 3, 5, 1.2, 0);
+            calcOpticalFlowFarneback(prevgray, gray, flow, 0.5, 3, 15, 3, 5, 1.2, 0);
             cvtColor(prevgray, cflow, CV_GRAY2BGR);
             drawOptFlowMap(flow, cflow, 16, 1.5, CV_RGB(0, 255, 0));
             imshow("flow", cflow);