This commit is contained in:
Vladislav Vinogradov 2011-08-09 09:15:04 +00:00
parent b2b1d41da8
commit 36bfa6ea1c
5 changed files with 5 additions and 10 deletions

View File

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

View File

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

View File

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

View File

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

View File

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