pull/13383/head
Vladislav Vinogradov 14 years ago
parent b2b1d41da8
commit 36bfa6ea1c
  1. 3
      modules/gpu/src/cuda/canny.cu
  2. 5
      modules/gpu/src/cuda/filters.cu
  3. 1
      modules/gpu/src/cuda/split_merge.cu
  4. 3
      modules/gpu/src/cuda/stereobp.cu
  5. 3
      modules/gpu/src/cuda/stereocsbp.cu

@ -40,6 +40,7 @@
//
//M*/
#include <utility>
#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);
}
}

@ -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;

@ -40,7 +40,6 @@
//
//M*/
#include "opencv2/gpu/devmem2d.hpp"
#include "internal_shared.hpp"
namespace cv { namespace gpu { namespace split_merge {

@ -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;

@ -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;

Loading…
Cancel
Save