From aaa8678cfff47549c5066521c52f318b1fb0ee79 Mon Sep 17 00:00:00 2001
From: Andrey Morozov <no@email>
Date: Wed, 18 Aug 2010 13:47:10 +0000
Subject: [PATCH] fixed some warnings

---
 modules/gpu/include/opencv2/gpu/gpu.hpp               | 7 ++++---
 modules/gpu/include/opencv2/gpu/matrix_operations.hpp | 2 ++
 modules/gpu/src/stereobm_gpu.cpp                      | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp
index 0a6ffe4..72d66fc 100644
--- 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;
             size_t step;
 
-            int alloc_type;
-
             uchar* data;
             int* refcount;
 
             uchar* datastart;
             uchar* dataend;
 
+            int alloc_type;
+
         };
 
         //////////////////////////////// CudaStream ////////////////////////////////
@@ -374,9 +374,10 @@ namespace cv
             // It queries current active device.
             static bool checkIfGpuCallReasonable();
 
+            int preset;
             int ndisp;
             int winSize;
-            int preset;
+
 
             // If avergeTexThreshold  == 0 => post procesing is disabled
             // If avergeTexThreshold != 0 then disparity is set 0 in each point (x,y) where for left image
diff --git a/modules/gpu/include/opencv2/gpu/matrix_operations.hpp b/modules/gpu/include/opencv2/gpu/matrix_operations.hpp
index 4b9987c..8e7cf95 100644
--- 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
 }
 
 inline void CudaMem::create(Size _size, int _type, int _alloc_type) { create(_size.height, _size.width, _type, _alloc_type); }
+
+
 //CCP void CudaMem::create(int _rows, int _cols, int _type, int _alloc_type);
 //CPP void CudaMem::release();
 
diff --git a/modules/gpu/src/stereobm_gpu.cpp b/modules/gpu/src/stereobm_gpu.cpp
index 2c1f56b..060a63b 100644
--- 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)  {}
 
 cv::gpu::StereoBM_GPU::StereoBM_GPU(int preset_, int ndisparities_, int winSize_)
-    : ndisp(ndisparities_), winSize(winSize_), preset(preset_), avergeTexThreshold(defaultAvgTexThreshold)
+    : preset(preset_), ndisp(ndisparities_), winSize(winSize_), avergeTexThreshold(defaultAvgTexThreshold)
 {
     const int max_supported_ndisp = 1 << (sizeof(unsigned char) * 8);
     CV_Assert(0 < ndisp && ndisp <= max_supported_ndisp);
-- 
2.7.4