fixed some warnings

diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp
index 0a6ffe4..72d66fc 100644 (file)
--- a/modules/gpu/include/opencv2/gpu/gpu.hpp
+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp
@@ -288,14 +288,14 @@ namespace cv
             int rows, cols;\r
             size_t step;\r
 \r
-            int alloc_type;\r
-\r
             uchar* data;\r
             int* refcount;\r
 \r
             uchar* datastart;\r
             uchar* dataend;\r
 \r
+            int alloc_type;\r
+\r
         };\r
 \r
         //////////////////////////////// CudaStream ////////////////////////////////\r
@@ -374,9 +374,10 @@ namespace cv
             // It queries current active device.\r
             static bool checkIfGpuCallReasonable();\r
 \r
+            int preset;\r
             int ndisp;\r
             int winSize;\r
-            int preset;\r
+\r
 \r
             // If avergeTexThreshold  == 0 => post procesing is disabled\r
             // If avergeTexThreshold != 0 then disparity is set 0 in each point (x,y) where for left image\r

diff --git a/modules/gpu/include/opencv2/gpu/matrix_operations.hpp b/modules/gpu/include/opencv2/gpu/matrix_operations.hpp
index 4b9987c..8e7cf95 100644 (file)
--- a/modules/gpu/include/opencv2/gpu/matrix_operations.hpp
+++ b/modules/gpu/include/opencv2/gpu/matrix_operations.hpp
@@ -403,6 +403,8 @@ inline CudaMem CudaMem::clone() const
 }\r
 \r
 inline void CudaMem::create(Size _size, int _type, int _alloc_type) { create(_size.height, _size.width, _type, _alloc_type); }\r
+\r
+\r
 //CCP void CudaMem::create(int _rows, int _cols, int _type, int _alloc_type);\r
 //CPP void CudaMem::release();\r
 \r

diff --git a/modules/gpu/src/stereobm_gpu.cpp b/modules/gpu/src/stereobm_gpu.cpp
index 2c1f56b..060a63b 100644 (file)
--- a/modules/gpu/src/stereobm_gpu.cpp
+++ b/modules/gpu/src/stereobm_gpu.cpp
@@ -73,7 +73,7 @@ cv::gpu::StereoBM_GPU::StereoBM_GPU()
     : preset(BASIC_PRESET), ndisp(DEFAULT_NDISP), winSize(DEFAULT_WINSZ), avergeTexThreshold(defaultAvgTexThreshold)  {}\r
 \r
 cv::gpu::StereoBM_GPU::StereoBM_GPU(int preset_, int ndisparities_, int winSize_)\r
-    : ndisp(ndisparities_), winSize(winSize_), preset(preset_), avergeTexThreshold(defaultAvgTexThreshold)\r
+    : preset(preset_), ndisp(ndisparities_), winSize(winSize_), avergeTexThreshold(defaultAvgTexThreshold)\r
 {\r
     const int max_supported_ndisp = 1 << (sizeof(unsigned char) * 8);\r
     CV_Assert(0 < ndisp && ndisp <= max_supported_ndisp);\r