diff --git a/modules/gpu/src/cuda/canny.cu b/modules/gpu/src/cuda/canny.cu index 5a7a868fa97d7d13c8ece34717c3a65319d222d3..b2acae9711345861677edd19d9501cb2d66a709a 100644 --- a/modules/gpu/src/cuda/canny.cu +++ b/modules/gpu/src/cuda/canny.cu @@ -40,6 +40,7 @@ // //M*/ +#include #include "internal_shared.hpp" #include "opencv2/gpu/device/utility.hpp" @@ -463,7 +464,7 @@ namespace cv { namespace gpu { namespace canny cudaSafeCall( cudaMemcpy(&count, counter_ptr, sizeof(unsigned int), cudaMemcpyDeviceToHost) ); - swap(st1, st2); + std::swap(st1, st2); } } diff --git a/modules/gpu/src/cuda/filters.cu b/modules/gpu/src/cuda/filters.cu index 9ca2825a5b71eb069af75262b6fd754ee3e54530..fd67fb96117672109560f7068ac3858acd159d32 100644 --- a/modules/gpu/src/cuda/filters.cu +++ b/modules/gpu/src/cuda/filters.cu @@ -40,15 +40,12 @@ // //M*/ -#include "opencv2/gpu/devmem2d.hpp" +#include "internal_shared.hpp" #include "opencv2/gpu/device/saturate_cast.hpp" #include "opencv2/gpu/device/vec_math.hpp" #include "opencv2/gpu/device/limits.hpp" #include "opencv2/gpu/device/border_interpolate.hpp" -#include "safe_call.hpp" -#include "internal_shared.hpp" - using namespace cv::gpu; using namespace cv::gpu::device; diff --git a/modules/gpu/src/cuda/split_merge.cu b/modules/gpu/src/cuda/split_merge.cu index e618ff8f13132cdb06c6cbd65da8259a7f4e5465..1f5ad73e81b4310f018b651b2dd42eb970764523 100644 --- a/modules/gpu/src/cuda/split_merge.cu +++ b/modules/gpu/src/cuda/split_merge.cu @@ -40,7 +40,6 @@ // //M*/ -#include "opencv2/gpu/devmem2d.hpp" #include "internal_shared.hpp" namespace cv { namespace gpu { namespace split_merge { diff --git a/modules/gpu/src/cuda/stereobp.cu b/modules/gpu/src/cuda/stereobp.cu index 6d1a5f4bed8e31c3bba4dce5ff6d6132ba5db711..e0f5fd40696085b7da0997a161075dcbb03477dd 100644 --- a/modules/gpu/src/cuda/stereobp.cu +++ b/modules/gpu/src/cuda/stereobp.cu @@ -40,10 +40,9 @@ // //M*/ -#include "opencv2/gpu/devmem2d.hpp" +#include "internal_shared.hpp" #include "opencv2/gpu/device/saturate_cast.hpp" #include "opencv2/gpu/device/limits.hpp" -#include "safe_call.hpp" using namespace cv::gpu; using namespace cv::gpu::device; diff --git a/modules/gpu/src/cuda/stereocsbp.cu b/modules/gpu/src/cuda/stereocsbp.cu index 5ed8938e039b8bf5c2fa822b2b338fde2ab94b69..f3f0680db93c7c91b49b18c94c263368257a6b3f 100644 --- a/modules/gpu/src/cuda/stereocsbp.cu +++ b/modules/gpu/src/cuda/stereocsbp.cu @@ -40,10 +40,9 @@ // //M*/ -#include "opencv2/gpu/devmem2d.hpp" +#include "internal_shared.hpp" #include "opencv2/gpu/device/saturate_cast.hpp" #include "opencv2/gpu/device/limits.hpp" -#include "safe_call.hpp" using namespace cv::gpu; using namespace cv::gpu::device;