fixed compilation error under linux

diff --git a/modules/gpu/src/element_operations.cpp b/modules/gpu/src/element_operations.cpp
index e1f1eb0..a7e5201 100644 (file)
--- 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
 \r
 namespace\r
 {\r
-    bool isIntScalar(Scalar sc)\r
+    inline bool isIntScalar(Scalar sc)\r
     {\r
-        Scalar_<int> isc(sc);\r
-\r
-        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];\r
+        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]);\r
     }\r
 }\r
 \r

diff --git a/modules/gpu/src/gftt.cpp b/modules/gpu/src/gftt.cpp
index f386ae9..fcafc7d 100644 (file)
--- 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,
 \r
                 tmp2.push_back(p);\r
 \r
-                if (maxCorners > 0 && tmp2.size() == maxCorners)\r
+                if (maxCorners > 0 && tmp2.size() == static_cast<size_t>(maxCorners))\r
                     break;\r
             }\r
         }\r

diff --git a/modules/gpu/src/pyrlk.cpp b/modules/gpu/src/pyrlk.cpp
index eaafd10..37427c5 100644 (file)
--- 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_);\r
     ensureSizeIsEnough(src.size(), CV_MAKETYPE(CV_16S, cn), dy_calcBuf_);\r
 \r
-    const int colsn = src.cols * cn;\r
-\r
     calcSharrDeriv_gpu(src, dx_calcBuf_, dy_calcBuf_, dIdx, dIdy, cn);\r
 }\r
 \r