Skip to content

Commit 90780db

Browse files
committed
Merge moved code from opencv
2 parents dccdaae + a741733 commit 90780db

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

modules/cudalegacy/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ endif()
44

55
set(the_description "CUDA-accelerated Computer Vision (legacy)")
66

7-
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4130 /wd4324 /wd4512 /wd4310 -Wundef -Wmissing-declarations -Wuninitialized -Wshadow)
7+
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4130 /wd4324 /wd4512 /wd4310 -Wundef -Wmissing-declarations -Wuninitialized -Wshadow -Wdeprecated-declarations -Wstrict-aliasing -Wtautological-compare)
88

99
ocv_define_module(cudalegacy opencv_core opencv_video
1010
OPTIONAL opencv_objdetect opencv_imgproc opencv_calib3d opencv_cudaarithm opencv_cudafilters opencv_cudaimgproc)

modules/cudaobjdetect/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ endif()
44

55
set(the_description "CUDA-accelerated Object Detection")
66

7-
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations -Wshadow)
7+
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations -Wshadow -Wstrict-aliasing)
88

99
ocv_define_module(cudaobjdetect opencv_objdetect opencv_cudaarithm opencv_cudawarping OPTIONAL opencv_cudalegacy WRAP python)

modules/cudaobjdetect/src/cuda/hog.cu

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ namespace cv { namespace cuda { namespace device
448448
compute_confidence_hists_kernel_many_blocks<nthreads, nblocks><<<grid, threads>>>(
449449
img_win_width, img_block_width, win_block_stride_x, win_block_stride_y,
450450
block_hists, coefs, free_coef, threshold, confidences);
451-
cudaSafeCall(cudaThreadSynchronize());
451+
cudaSafeCall(cudaDeviceSynchronize());
452452
}
453453

454454

modules/cudaoptflow/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ endif()
44

55
set(the_description "CUDA-accelerated Optical Flow")
66

7-
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations -Wshadow)
7+
ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations -Wshadow -Wstrict-aliasing)
88

99
ocv_define_module(cudaoptflow opencv_video opencv_optflow opencv_cudaarithm opencv_cudawarping opencv_cudaimgproc OPTIONAL opencv_cudalegacy WRAP python)
1010

0 commit comments

Comments
 (0)