Commit 36bfa6ea authored by Vladislav Vinogradov's avatar Vladislav Vinogradov

minor

parent b2b1d41d
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
// //
//M*/ //M*/
#include <utility>
#include "internal_shared.hpp" #include "internal_shared.hpp"
#include "opencv2/gpu/device/utility.hpp" #include "opencv2/gpu/device/utility.hpp"
...@@ -463,7 +464,7 @@ namespace cv { namespace gpu { namespace canny ...@@ -463,7 +464,7 @@ namespace cv { namespace gpu { namespace canny
cudaSafeCall( cudaMemcpy(&count, counter_ptr, sizeof(unsigned int), cudaMemcpyDeviceToHost) ); cudaSafeCall( cudaMemcpy(&count, counter_ptr, sizeof(unsigned int), cudaMemcpyDeviceToHost) );
swap(st1, st2); std::swap(st1, st2);
} }
} }
......
...@@ -40,15 +40,12 @@ ...@@ -40,15 +40,12 @@
// //
//M*/ //M*/
#include "opencv2/gpu/devmem2d.hpp" #include "internal_shared.hpp"
#include "opencv2/gpu/device/saturate_cast.hpp" #include "opencv2/gpu/device/saturate_cast.hpp"
#include "opencv2/gpu/device/vec_math.hpp" #include "opencv2/gpu/device/vec_math.hpp"
#include "opencv2/gpu/device/limits.hpp" #include "opencv2/gpu/device/limits.hpp"
#include "opencv2/gpu/device/border_interpolate.hpp" #include "opencv2/gpu/device/border_interpolate.hpp"
#include "safe_call.hpp"
#include "internal_shared.hpp"
using namespace cv::gpu; using namespace cv::gpu;
using namespace cv::gpu::device; using namespace cv::gpu::device;
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
// //
//M*/ //M*/
#include "opencv2/gpu/devmem2d.hpp"
#include "internal_shared.hpp" #include "internal_shared.hpp"
namespace cv { namespace gpu { namespace split_merge { namespace cv { namespace gpu { namespace split_merge {
......
...@@ -40,10 +40,9 @@ ...@@ -40,10 +40,9 @@
// //
//M*/ //M*/
#include "opencv2/gpu/devmem2d.hpp" #include "internal_shared.hpp"
#include "opencv2/gpu/device/saturate_cast.hpp" #include "opencv2/gpu/device/saturate_cast.hpp"
#include "opencv2/gpu/device/limits.hpp" #include "opencv2/gpu/device/limits.hpp"
#include "safe_call.hpp"
using namespace cv::gpu; using namespace cv::gpu;
using namespace cv::gpu::device; using namespace cv::gpu::device;
......
...@@ -40,10 +40,9 @@ ...@@ -40,10 +40,9 @@
// //
//M*/ //M*/
#include "opencv2/gpu/devmem2d.hpp" #include "internal_shared.hpp"
#include "opencv2/gpu/device/saturate_cast.hpp" #include "opencv2/gpu/device/saturate_cast.hpp"
#include "opencv2/gpu/device/limits.hpp" #include "opencv2/gpu/device/limits.hpp"
#include "safe_call.hpp"
using namespace cv::gpu; using namespace cv::gpu;
using namespace cv::gpu::device; using namespace cv::gpu::device;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment