minor refactoring:

moved lbp.hpp to src/cuda folder
added missing cv::gpu::device namespace
deleted whitespaces

modules/gpu/src/cuda/lbp.cu

@@ -42,9 +42,9 @@
 
 #if !defined CUDA_DISABLER
 
-#include <opencv2/gpu/device/lbp.hpp>
-#include <opencv2/gpu/device/vec_traits.hpp>
-#include <opencv2/gpu/device/saturate_cast.hpp>
+#include "lbp.hpp"
+#include "opencv2/gpu/device/vec_traits.hpp"
+#include "opencv2/gpu/device/saturate_cast.hpp"
 
 namespace cv { namespace gpu { namespace device
 {

modules/gpu/src/opencv2/gpu/device/detail/color_detail.hpp

@@ -1535,6 +1535,8 @@ namespace cv { namespace gpu { namespace device
             return functor_type(); \
         } \
     };
+
+    #undef CV_DESCALE
 }}} // namespace cv { namespace gpu { namespace device
 
 #endif // __OPENCV_GPU_COLOR_DETAIL_HPP__

modules/gpu/src/opencv2/gpu/device/detail/utility_detail.hpp → modules/gpu/src/opencv2/gpu/device/detail/reduction_detail.hpp

@@ -40,15 +40,15 @@
 //
 //M*/
 
-#ifndef __OPENCV_GPU_UTILITY_DETAIL_HPP__
-#define __OPENCV_GPU_UTILITY_DETAIL_HPP__
+#ifndef __OPENCV_GPU_REDUCTION_DETAIL_HPP__
+#define __OPENCV_GPU_REDUCTION_DETAIL_HPP__
 
 namespace cv { namespace gpu { namespace device
 {
     namespace utility_detail
     {
         ///////////////////////////////////////////////////////////////////////////////
-        // Reduction
+        // Reductor
 
         template <int n> struct WarpReductor
         {
@@ -838,4 +838,4 @@ namespace cv { namespace gpu { namespace device
     } // namespace utility_detail
 }}} // namespace cv { namespace gpu { namespace device
 
-#endif // __OPENCV_GPU_UTILITY_DETAIL_HPP__
+#endif // __OPENCV_GPU_REDUCTION_DETAIL_HPP__

modules/gpu/src/opencv2/gpu/device/detail/transform_detail.hpp

@@ -203,7 +203,7 @@ namespace cv { namespace gpu { namespace device
         };
 
         template <typename T, typename D, typename UnOp, typename Mask>
-        __global__ static void transformSmart(const PtrStepSz<T> src_, PtrStep<D> dst_, const Mask mask, const UnOp op)
+        static __global__ void transformSmart(const PtrStepSz<T> src_, PtrStep<D> dst_, const Mask mask, const UnOp op)
         {
             typedef TransformFunctorTraits<UnOp> ft;
             typedef typename UnaryReadWriteTraits<T, D, ft::smart_shift>::read_type read_type;
@@ -239,7 +239,7 @@ namespace cv { namespace gpu { namespace device
         }
 
         template <typename T, typename D, typename UnOp, typename Mask>
-        static __global__ void transformSimple(const PtrStepSz<T> src, PtrStep<D> dst, const Mask mask, const UnOp op)
+        __global__ static void transformSimple(const PtrStepSz<T> src, PtrStep<D> dst, const Mask mask, const UnOp op)
         {
             const int x = blockDim.x * blockIdx.x + threadIdx.x;
             const int y = blockDim.y * blockIdx.y + threadIdx.y;
@@ -251,7 +251,7 @@ namespace cv { namespace gpu { namespace device
         }
 
         template <typename T1, typename T2, typename D, typename BinOp, typename Mask>
-        __global__ static void transformSmart(const PtrStepSz<T1> src1_, const PtrStep<T2> src2_, PtrStep<D> dst_, 
+        static __global__ void transformSmart(const PtrStepSz<T1> src1_, const PtrStep<T2> src2_, PtrStep<D> dst_,
             const Mask mask, const BinOp op)
         {
             typedef TransformFunctorTraits<BinOp> ft;

modules/gpu/src/opencv2/gpu/device/scan.hpp

@@ -43,6 +43,10 @@
 #ifndef __OPENCV_GPU_SCAN_HPP__
 #define __OPENCV_GPU_SCAN_HPP__
 
+#include "common.hpp"
+
+namespace cv { namespace gpu { namespace device
+{
     enum ScanKind { EXCLUSIVE = 0,  INCLUSIVE = 1 };
 
     template <ScanKind Kind, typename T, typename F> struct WarpScan
@@ -162,5 +166,6 @@
         static const int warp_log  = 5;
         static const int warp_mask = 31;
     };
+}}}
 
-#endif
\ No newline at end of file
+#endif // __OPENCV_GPU_SCAN_HPP__

modules/gpu/src/opencv2/gpu/device/static_check.hpp

@@ -60,8 +60,6 @@ namespace cv { namespace gpu
             __OPENCV_GPU_HOST_DEVICE__ static void check() {};
         };
     }
-
-    using ::cv::gpu::device::Static;
 }}
 
 #undef __OPENCV_GPU_HOST_DEVICE__

modules/gpu/src/opencv2/gpu/device/utility.hpp

@@ -45,7 +45,7 @@
 
 #include "saturate_cast.hpp"
 #include "datamov_utils.hpp"
-#include "detail/utility_detail.hpp"
+#include "detail/reduction_detail.hpp"
 
 namespace cv { namespace gpu { namespace device
 {