From f0f87ebf36c0bccc6085c6a24672793f0f82e0bb Mon Sep 17 00:00:00 2001
From: Vladislav Vinogradov <no@email>
Date: Wed, 22 Feb 2012 11:22:31 +0000
Subject: [PATCH] fixed compilation error under linux

---
 modules/gpu/src/element_operations.cpp | 6 ++----
 modules/gpu/src/gftt.cpp               | 2 +-
 modules/gpu/src/pyrlk.cpp              | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/modules/gpu/src/element_operations.cpp b/modules/gpu/src/element_operations.cpp
index e1f1eb05eb..a7e5201555 100644
--- a/modules/gpu/src/element_operations.cpp
+++ b/modules/gpu/src/element_operations.cpp
@@ -654,11 +654,9 @@ void cv::gpu::multiply(const GpuMat& src1, const GpuMat& src2, GpuMat& dst, doub
 
 namespace
 {
-    bool isIntScalar(Scalar sc)
+    inline bool isIntScalar(Scalar sc)
     {
-        Scalar_<int> isc(sc);
-
-        return sc.val[0] == isc.val[0] && sc.val[1] == isc.val[1] && sc.val[2] == isc.val[2] && sc.val[3] == isc.val[3];
+        return sc.val[0] == static_cast<int>(sc.val[0]) && sc.val[1] == static_cast<int>(sc.val[1]) && sc.val[2] == static_cast<int>(sc.val[2]) && sc.val[3] == static_cast<int>(sc.val[3]);
     }
 }
 
diff --git a/modules/gpu/src/gftt.cpp b/modules/gpu/src/gftt.cpp
index f386ae94fd..fcafc7d0e7 100644
--- a/modules/gpu/src/gftt.cpp
+++ b/modules/gpu/src/gftt.cpp
@@ -153,7 +153,7 @@ void cv::gpu::GoodFeaturesToTrackDetector_GPU::operator ()(const GpuMat& image,
 
                 tmp2.push_back(p);
 
-                if (maxCorners > 0 && tmp2.size() == maxCorners)
+                if (maxCorners > 0 && tmp2.size() == static_cast<size_t>(maxCorners))
                     break;
             }
         }
diff --git a/modules/gpu/src/pyrlk.cpp b/modules/gpu/src/pyrlk.cpp
index eaafd104e0..37427c511a 100644
--- a/modules/gpu/src/pyrlk.cpp
+++ b/modules/gpu/src/pyrlk.cpp
@@ -83,8 +83,6 @@ void cv::gpu::PyrLKOpticalFlow::calcSharrDeriv(const GpuMat& src, GpuMat& dIdx,
     ensureSizeIsEnough(src.size(), CV_MAKETYPE(CV_16S, cn), dx_calcBuf_);
     ensureSizeIsEnough(src.size(), CV_MAKETYPE(CV_16S, cn), dy_calcBuf_);
 
-    const int colsn = src.cols * cn;
-
     calcSharrDeriv_gpu(src, dx_calcBuf_, dy_calcBuf_, dIdx, dIdy, cn);
 }
 
-- 
GitLab