fixed build without cuda

diff --git a/modules/gpu/src/beliefpropagation_gpu.cpp b/modules/gpu/src/beliefpropagation_gpu.cpp
index e79bd66..657ec78 100644 (file)
--- a/modules/gpu/src/beliefpropagation_gpu.cpp
+++ b/modules/gpu/src/beliefpropagation_gpu.cpp
@@ -52,11 +52,11 @@ cv::gpu::StereoBeliefPropagation::StereoBeliefPropagation(int, int, int, int) {
 cv::gpu::StereoBeliefPropagation::StereoBeliefPropagation(int, int, int, float, float, float, float, int) { throw_nogpu(); }\r
 \r
 void cv::gpu::StereoBeliefPropagation::operator()(const GpuMat&, const GpuMat&, GpuMat&) { throw_nogpu(); }\r
-void cv::gpu::StereoBeliefPropagation::operator()(const GpuMat&, const GpuMat&, GpuMat&, const Stream&) { throw_nogpu(); }\r
+void cv::gpu::StereoBeliefPropagation::operator()(const GpuMat&, const GpuMat&, GpuMat&, Stream&) { throw_nogpu(); }\r
 \r
 #else /* !defined (HAVE_CUDA) */\r
 \r
-namespace cv { namespace gpu { namespace bp \r
+namespace cv { namespace gpu { namespace bp\r
 {\r
     void load_constants(int ndisp, float max_data_term, float data_weight, float max_disc_term, float disc_single_jump);\r
     void comp_data(int msg_type, const DevMem2D& l, const DevMem2D& r, int channels, DevMem2D mdata, const cudaStream_t& stream);\r
@@ -75,22 +75,22 @@ namespace
 }\r
 \r
 cv::gpu::StereoBeliefPropagation::StereoBeliefPropagation(int ndisp_, int iters_, int levels_, int msg_type_)\r
-    : ndisp(ndisp_), iters(iters_), levels(levels_), \r
-      max_data_term(DEFAULT_MAX_DATA_TERM), data_weight(DEFAULT_DATA_WEIGHT), \r
-      max_disc_term(DEFAULT_MAX_DISC_TERM), disc_single_jump(DEFAULT_DISC_SINGLE_JUMP), \r
+    : ndisp(ndisp_), iters(iters_), levels(levels_),\r
+      max_data_term(DEFAULT_MAX_DATA_TERM), data_weight(DEFAULT_DATA_WEIGHT),\r
+      max_disc_term(DEFAULT_MAX_DISC_TERM), disc_single_jump(DEFAULT_DISC_SINGLE_JUMP),\r
       msg_type(msg_type_), datas(levels_)\r
 {\r
 }\r
 \r
 cv::gpu::StereoBeliefPropagation::StereoBeliefPropagation(int ndisp_, int iters_, int levels_, float max_data_term_, float data_weight_, float max_disc_term_, float disc_single_jump_, int msg_type_)\r
-    : ndisp(ndisp_), iters(iters_), levels(levels_), \r
-      max_data_term(max_data_term_), data_weight(data_weight_), \r
-      max_disc_term(max_disc_term_), disc_single_jump(disc_single_jump_), \r
+    : ndisp(ndisp_), iters(iters_), levels(levels_),\r
+      max_data_term(max_data_term_), data_weight(data_weight_),\r
+      max_disc_term(max_disc_term_), disc_single_jump(disc_single_jump_),\r
       msg_type(msg_type_), datas(levels_)\r
 {\r
 }\r
 \r
-static void stereo_bp_gpu_operator(int& ndisp, int& iters, int& levels, \r
+static void stereo_bp_gpu_operator(int& ndisp, int& iters, int& levels,\r
                                    float& max_data_term, float& data_weight, float& max_disc_term, float& disc_single_jump,\r
                                    int& msg_type,\r
                                    GpuMat& u, GpuMat& d, GpuMat& l, GpuMat& r,\r
@@ -116,7 +116,7 @@ static void stereo_bp_gpu_operator(int& ndisp, int& iters, int& levels,
     int lowest_cols = cols / divisor;\r
     int lowest_rows = rows / divisor;\r
     const int min_image_dim_size = 2;\r
-    CV_Assert(min(lowest_cols, lowest_rows) > min_image_dim_size);    \r
+    CV_Assert(min(lowest_cols, lowest_rows) > min_image_dim_size);\r
 \r
     u.create(rows * ndisp, cols, msg_type);\r
     d.create(rows * ndisp, cols, msg_type);\r
@@ -200,7 +200,7 @@ static void stereo_bp_gpu_operator(int& ndisp, int& iters, int& levels,
 \r
     out = ((disp.type() == CV_16S) ? disp : GpuMat(rows, cols, CV_16S));\r
     out = zero;\r
-    \r
+\r
     bp::output(msg_type, u, d, l, r, datas.front(), disp, stream);\r
 \r
     if (disp.type() != CV_16S)\r

diff --git a/modules/gpu/src/constantspacebp_gpu.cpp b/modules/gpu/src/constantspacebp_gpu.cpp
index 863ad06..ae71af2 100644 (file)
--- a/modules/gpu/src/constantspacebp_gpu.cpp
+++ b/modules/gpu/src/constantspacebp_gpu.cpp
@@ -52,12 +52,12 @@ cv::gpu::StereoConstantSpaceBP::StereoConstantSpaceBP(int, int, int, int, int) {
 cv::gpu::StereoConstantSpaceBP::StereoConstantSpaceBP(int, int, int, int, float, float, float, float, int, int) { throw_nogpu(); }\r
 \r
 void cv::gpu::StereoConstantSpaceBP::operator()(const GpuMat&, const GpuMat&, GpuMat&) { throw_nogpu(); }\r
-void cv::gpu::StereoConstantSpaceBP::operator()(const GpuMat&, const GpuMat&, GpuMat&, const Stream&) { throw_nogpu(); }\r
+void cv::gpu::StereoConstantSpaceBP::operator()(const GpuMat&, const GpuMat&, GpuMat&, Stream&) { throw_nogpu(); }\r
 \r
 #else /* !defined (HAVE_CUDA) */\r
 \r
-namespace cv { namespace gpu { namespace csbp \r
-{   \r
+namespace cv { namespace gpu { namespace csbp\r
+{\r
     void load_constants(int ndisp, float max_data_term, float data_weight, float max_disc_term, float disc_single_jump, int min_disp_th,\r
         const DevMem2D& left, const DevMem2D& right, const DevMem2D& temp);\r
 \r
@@ -72,28 +72,28 @@ namespace cv { namespace gpu { namespace csbp
     void compute_data_cost(const float* disp_selected_pyr, float* data_cost, size_t msg_step1, size_t msg_step2,\r
         int rows, int cols, int h, int w, int h2, int level, int nr_plane, int channels, cudaStream_t stream);\r
 \r
-    void init_message(short* u_new, short* d_new, short* l_new, short* r_new, \r
-        const short* u_cur, const short* d_cur, const short* l_cur, const short* r_cur, \r
-        short* selected_disp_pyr_new, const short* selected_disp_pyr_cur, \r
-        short* data_cost_selected, const short* data_cost, size_t msg_step1, size_t msg_step2, \r
+    void init_message(short* u_new, short* d_new, short* l_new, short* r_new,\r
+        const short* u_cur, const short* d_cur, const short* l_cur, const short* r_cur,\r
+        short* selected_disp_pyr_new, const short* selected_disp_pyr_cur,\r
+        short* data_cost_selected, const short* data_cost, size_t msg_step1, size_t msg_step2,\r
         int h, int w, int nr_plane, int h2, int w2, int nr_plane2, cudaStream_t stream);\r
 \r
-    void init_message(float* u_new, float* d_new, float* l_new, float* r_new, \r
-        const float* u_cur, const float* d_cur, const float* l_cur, const float* r_cur, \r
-        float* selected_disp_pyr_new, const float* selected_disp_pyr_cur, \r
-        float* data_cost_selected, const float* data_cost, size_t msg_step1, size_t msg_step2, \r
+    void init_message(float* u_new, float* d_new, float* l_new, float* r_new,\r
+        const float* u_cur, const float* d_cur, const float* l_cur, const float* r_cur,\r
+        float* selected_disp_pyr_new, const float* selected_disp_pyr_cur,\r
+        float* data_cost_selected, const float* data_cost, size_t msg_step1, size_t msg_step2,\r
         int h, int w, int nr_plane, int h2, int w2, int nr_plane2, cudaStream_t stream);\r
 \r
-    void calc_all_iterations(short* u, short* d, short* l, short* r, short* data_cost_selected, \r
-        const short* selected_disp_pyr_cur, size_t msg_step, int h, int w, int nr_plane, int iters, cudaStream_t stream);  \r
+    void calc_all_iterations(short* u, short* d, short* l, short* r, short* data_cost_selected,\r
+        const short* selected_disp_pyr_cur, size_t msg_step, int h, int w, int nr_plane, int iters, cudaStream_t stream);\r
 \r
-    void calc_all_iterations(float*u, float* d, float* l, float* r, float* data_cost_selected, \r
+    void calc_all_iterations(float*u, float* d, float* l, float* r, float* data_cost_selected,\r
         const float* selected_disp_pyr_cur, size_t msg_step, int h, int w, int nr_plane, int iters, cudaStream_t stream);\r
 \r
-    void compute_disp(const short* u, const short* d, const short* l, const short* r, const short* data_cost_selected, const short* disp_selected, size_t msg_step, \r
+    void compute_disp(const short* u, const short* d, const short* l, const short* r, const short* data_cost_selected, const short* disp_selected, size_t msg_step,\r
         DevMem2D_<short> disp, int nr_plane, cudaStream_t stream);\r
 \r
-    void compute_disp(const float* u, const float* d, const float* l, const float* r, const float* data_cost_selected, const float* disp_selected, size_t msg_step, \r
+    void compute_disp(const float* u, const float* d, const float* l, const float* r, const float* data_cost_selected, const float* disp_selected, size_t msg_step,\r
         DevMem2D_<short> disp, int nr_plane, cudaStream_t stream);\r
 }}}\r
 \r
@@ -108,24 +108,24 @@ namespace
 cv::gpu::StereoConstantSpaceBP::StereoConstantSpaceBP(int ndisp_, int iters_, int levels_, int nr_plane_,\r
                                                       int msg_type_)\r
 \r
-    : ndisp(ndisp_), iters(iters_), levels(levels_), nr_plane(nr_plane_), \r
-      max_data_term(DEFAULT_MAX_DATA_TERM), data_weight(DEFAULT_DATA_WEIGHT), \r
+    : ndisp(ndisp_), iters(iters_), levels(levels_), nr_plane(nr_plane_),\r
+      max_data_term(DEFAULT_MAX_DATA_TERM), data_weight(DEFAULT_DATA_WEIGHT),\r
       max_disc_term(DEFAULT_MAX_DISC_TERM), disc_single_jump(DEFAULT_DISC_SINGLE_JUMP), min_disp_th(0),\r
       msg_type(msg_type_)\r
-{  \r
+{\r
     CV_Assert(msg_type_ == CV_32F || msg_type_ == CV_16S);\r
 }\r
 \r
 cv::gpu::StereoConstantSpaceBP::StereoConstantSpaceBP(int ndisp_, int iters_, int levels_, int nr_plane_,\r
                                                       float max_data_term_, float data_weight_, float max_disc_term_, float disc_single_jump_,\r
                                                       int min_disp_th_, int msg_type_)\r
-    : ndisp(ndisp_), iters(iters_), levels(levels_), nr_plane(nr_plane_), \r
-      max_data_term(max_data_term_), data_weight(data_weight_), \r
+    : ndisp(ndisp_), iters(iters_), levels(levels_), nr_plane(nr_plane_),\r
+      max_data_term(max_data_term_), data_weight(data_weight_),\r
       max_disc_term(max_disc_term_), disc_single_jump(disc_single_jump_), min_disp_th(min_disp_th_),\r
       msg_type(msg_type_)\r
-{   \r
+{\r
     CV_Assert(msg_type_ == CV_32F || msg_type_ == CV_16S);\r
-}        \r
+}\r
 \r
 template<class T>\r
 static void csbp_operator(StereoConstantSpaceBP& rthis, GpuMat u[2], GpuMat d[2], GpuMat l[2], GpuMat r[2],\r
@@ -133,14 +133,14 @@ static void csbp_operator(StereoConstantSpaceBP& rthis, GpuMat u[2], GpuMat d[2]
                                      GpuMat& temp, GpuMat& out, const GpuMat& left, const GpuMat& right, GpuMat& disp,\r
                                      cudaStream_t stream)\r
 {\r
-    CV_DbgAssert(0 < rthis.ndisp && 0 < rthis.iters && 0 < rthis.levels && 0 < rthis.nr_plane       \r
+    CV_DbgAssert(0 < rthis.ndisp && 0 < rthis.iters && 0 < rthis.levels && 0 < rthis.nr_plane\r
         && left.rows == right.rows && left.cols == right.cols && left.type() == right.type());\r
 \r
-    CV_Assert(rthis.levels <= 8 && (left.type() == CV_8UC1 || left.type() == CV_8UC3));    \r
+    CV_Assert(rthis.levels <= 8 && (left.type() == CV_8UC1 || left.type() == CV_8UC3));\r
 \r
     const Scalar zero = Scalar::all(0);\r
     const float scale = (rthis.msg_type == CV_32F) ? 1.0f : 10.0f;\r
-    \r
+\r
     ////////////////////////////////////////////////////////////////////////////////////////////\r
     // Init\r
 \r
@@ -180,13 +180,13 @@ static void csbp_operator(StereoConstantSpaceBP& rthis, GpuMat u[2], GpuMat d[2]
     d[0].create(msg_size, DataType<T>::type);\r
     l[0].create(msg_size, DataType<T>::type);\r
     r[0].create(msg_size, DataType<T>::type);\r
-    \r
+\r
     u[1].create(msg_size, DataType<T>::type);\r
     d[1].create(msg_size, DataType<T>::type);\r
     l[1].create(msg_size, DataType<T>::type);\r
     r[1].create(msg_size, DataType<T>::type);\r
-    \r
-    disp_selected_pyr[0].create(msg_size, DataType<T>::type);    \r
+\r
+    disp_selected_pyr[0].create(msg_size, DataType<T>::type);\r
     disp_selected_pyr[1].create(msg_size, DataType<T>::type);\r
 \r
     data_cost.create(data_cost_size, DataType<T>::type);\r
@@ -203,7 +203,7 @@ static void csbp_operator(StereoConstantSpaceBP& rthis, GpuMat u[2], GpuMat d[2]
     ////////////////////////////////////////////////////////////////////////////\r
     // Compute\r
 \r
-    csbp::load_constants(rthis.ndisp, rthis.max_data_term, scale * rthis.data_weight, \r
+    csbp::load_constants(rthis.ndisp, rthis.max_data_term, scale * rthis.data_weight,\r
         scale * rthis.max_disc_term, scale * rthis.disc_single_jump, rthis.min_disp_th, left, right, temp);\r
 \r
     l[0] = zero;\r
@@ -225,12 +225,12 @@ static void csbp_operator(StereoConstantSpaceBP& rthis, GpuMat u[2], GpuMat d[2]
     {\r
         if (i == levels - 1)\r
         {\r
-            csbp::init_data_cost(left.rows, left.cols, disp_selected_pyr[cur_idx].ptr<T>(), data_cost_selected.ptr<T>(), \r
+            csbp::init_data_cost(left.rows, left.cols, disp_selected_pyr[cur_idx].ptr<T>(), data_cost_selected.ptr<T>(),\r
                 step_pyr[i], rows_pyr[i], cols_pyr[i], i, nr_plane_pyr[i], rthis.ndisp, left.channels(), stream);\r
         }\r
         else\r
         {\r
-            csbp::compute_data_cost(disp_selected_pyr[cur_idx].ptr<T>(), data_cost.ptr<T>(), step_pyr[i], step_pyr[i+1], \r
+            csbp::compute_data_cost(disp_selected_pyr[cur_idx].ptr<T>(), data_cost.ptr<T>(), step_pyr[i], step_pyr[i+1],\r
                 left.rows, left.cols, rows_pyr[i], cols_pyr[i], rows_pyr[i+1], i, nr_plane_pyr[i+1], left.channels(), stream);\r
 \r
             int new_idx = (cur_idx + 1) & 1;\r
@@ -238,14 +238,14 @@ static void csbp_operator(StereoConstantSpaceBP& rthis, GpuMat u[2], GpuMat d[2]
             csbp::init_message(u[new_idx].ptr<T>(), d[new_idx].ptr<T>(), l[new_idx].ptr<T>(), r[new_idx].ptr<T>(),\r
                                u[cur_idx].ptr<T>(), d[cur_idx].ptr<T>(), l[cur_idx].ptr<T>(), r[cur_idx].ptr<T>(),\r
                                disp_selected_pyr[new_idx].ptr<T>(), disp_selected_pyr[cur_idx].ptr<T>(),\r
-                               data_cost_selected.ptr<T>(), data_cost.ptr<T>(), step_pyr[i], step_pyr[i+1], rows_pyr[i], \r
+                               data_cost_selected.ptr<T>(), data_cost.ptr<T>(), step_pyr[i], step_pyr[i+1], rows_pyr[i],\r
                                cols_pyr[i], nr_plane_pyr[i], rows_pyr[i+1], cols_pyr[i+1], nr_plane_pyr[i+1], stream);\r
 \r
             cur_idx = new_idx;\r
         }\r
 \r
-        csbp::calc_all_iterations(u[cur_idx].ptr<T>(), d[cur_idx].ptr<T>(), l[cur_idx].ptr<T>(), r[cur_idx].ptr<T>(), \r
-                                  data_cost_selected.ptr<T>(), disp_selected_pyr[cur_idx].ptr<T>(), step_pyr[i], \r
+        csbp::calc_all_iterations(u[cur_idx].ptr<T>(), d[cur_idx].ptr<T>(), l[cur_idx].ptr<T>(), r[cur_idx].ptr<T>(),\r
+                                  data_cost_selected.ptr<T>(), disp_selected_pyr[cur_idx].ptr<T>(), step_pyr[i],\r
                                   rows_pyr[i], cols_pyr[i], nr_plane_pyr[i], rthis.iters, stream);\r
     }\r
 \r
@@ -254,9 +254,9 @@ static void csbp_operator(StereoConstantSpaceBP& rthis, GpuMat u[2], GpuMat d[2]
 \r
     out = ((disp.type() == CV_16S) ? disp : GpuMat(rows, cols, CV_16S));\r
     out = zero;\r
-    \r
-    csbp::compute_disp(u[cur_idx].ptr<T>(), d[cur_idx].ptr<T>(), l[cur_idx].ptr<T>(), r[cur_idx].ptr<T>(), \r
-                       data_cost_selected.ptr<T>(), disp_selected_pyr[cur_idx].ptr<T>(), step_pyr[0], out, nr_plane_pyr[0], stream);    \r
+\r
+    csbp::compute_disp(u[cur_idx].ptr<T>(), d[cur_idx].ptr<T>(), l[cur_idx].ptr<T>(), r[cur_idx].ptr<T>(),\r
+                       data_cost_selected.ptr<T>(), disp_selected_pyr[cur_idx].ptr<T>(), step_pyr[0], out, nr_plane_pyr[0], stream);\r
 \r
     if (disp.type() != CV_16S)\r
         out.convertTo(disp, disp.type());\r
@@ -271,13 +271,13 @@ typedef void (*csbp_operator_t)(StereoConstantSpaceBP& rthis, GpuMat u[2], GpuMa
 const static csbp_operator_t operators[] = {0, 0, 0, csbp_operator<short>, 0, csbp_operator<float>, 0, 0};\r
 \r
 void cv::gpu::StereoConstantSpaceBP::operator()(const GpuMat& left, const GpuMat& right, GpuMat& disp)\r
-{    \r
+{\r
     CV_Assert(msg_type == CV_32F || msg_type == CV_16S);\r
     operators[msg_type](*this, u, d, l, r, disp_selected_pyr, data_cost, data_cost_selected, temp, out, left, right, disp, 0);\r
 }\r
 \r
 void cv::gpu::StereoConstantSpaceBP::operator()(const GpuMat& left, const GpuMat& right, GpuMat& disp, Stream& stream)\r
-{            \r
+{\r
     CV_Assert(msg_type == CV_32F || msg_type == CV_16S);\r
     operators[msg_type](*this, u, d, l, r, disp_selected_pyr, data_cost, data_cost_selected, temp, out, left, right, disp, StreamAccessor::getStream(stream));\r
 }\r