Merge pull request #1835 from alalek:rgbd_fix_opencl

modules/rgbd/src/depth_to_3d.hpp

@@ -7,8 +7,6 @@
 #ifndef __OPENCV_RGBD_DEPTH_TO_3D_HPP__
 #define __OPENCV_RGBD_DEPTH_TO_3D_HPP__
 
-#include "precomp.hpp"
-
 namespace cv
 {
 namespace rgbd

modules/rgbd/src/fast_icp.cpp

@@ -6,6 +6,7 @@
 
 #include "precomp.hpp"
 #include "fast_icp.hpp"
+#include "opencl_kernels_rgbd.hpp"
 
 using namespace std;
 

modules/rgbd/src/kinfu.cpp

@@ -321,7 +321,7 @@ void KinFuImpl<T>::getNormals(InputArray points, OutputArray normals) const
 Ptr<KinFu> KinFu::create(const Ptr<Params>& params)
 {
 #ifdef HAVE_OPENCL
-    if(cv::ocl::isOpenCLActivated())
+    if(cv::ocl::useOpenCL())
         return makePtr< KinFuImpl<UMat> >(*params);
 #endif
     return makePtr< KinFuImpl<Mat> >(*params);

modules/rgbd/src/kinfu_frame.cpp

@@ -6,6 +6,7 @@
 
 #include "precomp.hpp"
 #include "kinfu_frame.hpp"
+#include "opencl_kernels_rgbd.hpp"
 
 namespace cv {
 namespace kinfu {

modules/rgbd/src/kinfu_frame.hpp

@@ -7,7 +7,6 @@
 #ifndef __OPENCV_KINFU_FRAME_H__
 #define __OPENCV_KINFU_FRAME_H__
 
-#include "precomp.hpp"
 #include "utils.hpp"
 
 namespace cv {

modules/rgbd/src/precomp.hpp

@@ -10,17 +10,17 @@
 #ifndef __OPENCV_PRECOMP_H__
 #define __OPENCV_PRECOMP_H__
 
+#include <iostream>
+#include <list>
+#include <set>
+#include <limits>
+
 #include "opencv2/core/utility.hpp"
 #include "opencv2/core/private.hpp"
 #include "opencv2/core/hal/intrin.hpp"
 #include "opencv2/core/ocl.hpp"
-#include "opencl_kernels_rgbd.hpp"
 #include "opencv2/imgproc.hpp"
 #include "opencv2/calib3d.hpp"
 #include "opencv2/rgbd.hpp"
-#include <iostream>
-#include <list>
-#include <set>
-#include <limits>
 
 #endif

modules/rgbd/src/tsdf.cpp

@@ -6,6 +6,7 @@
 
 #include "precomp.hpp"
 #include "tsdf.hpp"
+#include "opencl_kernels_rgbd.hpp"
 
 namespace cv {
 
@@ -1473,7 +1474,7 @@ cv::Ptr<TSDFVolume> makeTSDFVolume(Point3i _res,  float _voxelSize, cv::Affine3f
                                    float _raycastStepFactor)
 {
 #ifdef HAVE_OPENCL
-    if(cv::ocl::isOpenCLActivated())
+    if(cv::ocl::useOpenCL())
         return cv::makePtr<TSDFVolumeGPU>(_res, _voxelSize, _pose, _truncDist, _maxWeight, _raycastStepFactor);
 #endif
     return cv::makePtr<TSDFVolumeCPU>(_res, _voxelSize, _pose, _truncDist, _maxWeight, _raycastStepFactor);

modules/rgbd/src/tsdf.hpp

@@ -7,7 +7,6 @@
 #ifndef __OPENCV_KINFU_TSDF_H__
 #define __OPENCV_KINFU_TSDF_H__
 
-#include "precomp.hpp"
 #include "kinfu_frame.hpp"
 
 namespace cv {

modules/rgbd/src/utils.cpp

@@ -6,6 +6,7 @@
 
 // This code is also subject to the license terms in the LICENSE_WillowGarage.md file found in this module's directory
 
+#include "precomp.hpp"
 #include "utils.hpp"
 
 namespace cv

modules/rgbd/src/utils.hpp

@@ -9,8 +9,6 @@
 #ifndef __OPENCV_RGBD_UTILS_HPP__
 #define __OPENCV_RGBD_UTILS_HPP__
 
-#include "precomp.hpp"
-
 namespace cv
 {
 namespace rgbd