fixed some warnings under linux

diff --git a/modules/gpu/src/filtering.cpp b/modules/gpu/src/filtering.cpp
index b611e49..b9b8a8d 100644 (file)
--- a/modules/gpu/src/filtering.cpp
+++ b/modules/gpu/src/filtering.cpp
@@ -810,7 +810,6 @@ Ptr<FilterEngine_GPU> cv::gpu::createSeparableLinearFilter_GPU(int srcType, int
     if (columnBorderType < 0)\r
         columnBorderType = rowBorderType;\r
 \r
-    int sdepth = CV_MAT_DEPTH(srcType), ddepth = CV_MAT_DEPTH(dstType);\r
     int cn = CV_MAT_CN(srcType);\r
     int bdepth = CV_32F;\r
     int bufType = CV_MAKETYPE(bdepth, cn);\r

diff --git a/modules/gpu/src/imgproc_gpu.cpp b/modules/gpu/src/imgproc_gpu.cpp
index 88e3e41..7374c93 100644 (file)
--- a/modules/gpu/src/imgproc_gpu.cpp
+++ b/modules/gpu/src/imgproc_gpu.cpp
@@ -309,12 +309,12 @@ void cv::gpu::copyMakeBorder(const GpuMat& src, GpuMat& dst, int top, int bottom
 \r
     dst.create(src.rows + top + bottom, src.cols + left + right, src.type());\r
 \r
-       NppiSize srcsz;\r
-       srcsz.width  = src.cols;\r
-       srcsz.height = src.rows;\r
+    NppiSize srcsz;\r
+    srcsz.width  = src.cols;\r
+    srcsz.height = src.rows;\r
     NppiSize dstsz;\r
-        dstsz.width  = dst.cols;\r
-        dstsz.height = dst.rows;\r
+    dstsz.width  = dst.cols;\r
+    dstsz.height = dst.rows;\r
 \r
     switch (src.type())\r
     {\r
@@ -341,7 +341,7 @@ void cv::gpu::copyMakeBorder(const GpuMat& src, GpuMat& dst, int top, int bottom
         }\r
     case CV_32FC1:\r
         {\r
-            float val = static_cast<float>(value[0]);\r
+            Npp32f val = static_cast<Npp32f>(value[0]);\r
             Npp32s nVal = *(reinterpret_cast<Npp32s*>(&val));\r
             nppSafeCall( nppiCopyConstBorder_32s_C1R(src.ptr<Npp32s>(), src.step, srcsz,\r
                 dst.ptr<Npp32s>(), dst.step, dstsz, top, left, nVal) );\r

diff --git a/modules/gpu/src/match_template.cpp b/modules/gpu/src/match_template.cpp
index 20e1d1b..e78badb 100644 (file)
--- a/modules/gpu/src/match_template.cpp
+++ b/modules/gpu/src/match_template.cpp
@@ -577,7 +577,7 @@ void cv::gpu::matchTemplate(const GpuMat& image, const GpuMat& templ, GpuMat& re
     static const Caller callers32F[] = { ::matchTemplate_SQDIFF_32F, 0, \r
                                          ::matchTemplate_CCORR_32F, 0, 0, 0 };\r
 \r
-    const Caller* callers;\r
+    const Caller* callers = 0;\r
     switch (image.depth())\r
     {\r
         case CV_8U: callers = callers8U; break;\r

diff --git a/modules/gpu/src/stereobp.cpp b/modules/gpu/src/stereobp.cpp
index 1487abb..f4dd8f1 100644 (file)
--- a/modules/gpu/src/stereobp.cpp
+++ b/modules/gpu/src/stereobp.cpp
@@ -130,9 +130,7 @@ namespace
         {\r
             CV_Assert(0 < rthis.ndisp && 0 < rthis.iters && 0 < rthis.levels);\r
             CV_Assert(rthis.msg_type == CV_32F || rthis.msg_type == CV_16S);\r
-\r
-            if (rthis.msg_type == CV_16S)\r
-                CV_Assert((1 << (rthis.levels - 1)) * scale * rthis.max_data_term < numeric_limits<short>::max());\r
+            CV_Assert(rthis.msg_type == CV_32F || (1 << (rthis.levels - 1)) * scale * rthis.max_data_term < numeric_limits<short>::max());\r
         }\r
 \r
         void operator()(const GpuMat& left, const GpuMat& right, GpuMat& disp, cudaStream_t stream)\r