Merge moved code from opencv

alalek · alalek · commit 90780db92add · 2019-08-13T18:32:58.000+03:00
diff --git a/modules/cudalegacy/CMakeLists.txt b/modules/cudalegacy/CMakeLists.txt
@@ -4,7 +4,7 @@ endif()
 
 set(the_description "CUDA-accelerated Computer Vision (legacy)")
 
-ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4130 /wd4324 /wd4512 /wd4310 -Wundef -Wmissing-declarations -Wuninitialized -Wshadow)
+ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4130 /wd4324 /wd4512 /wd4310 -Wundef -Wmissing-declarations -Wuninitialized -Wshadow -Wdeprecated-declarations -Wstrict-aliasing -Wtautological-compare)
 
 ocv_define_module(cudalegacy opencv_core opencv_video
   OPTIONAL opencv_objdetect opencv_imgproc opencv_calib3d opencv_cudaarithm opencv_cudafilters opencv_cudaimgproc)
diff --git a/modules/cudaobjdetect/CMakeLists.txt b/modules/cudaobjdetect/CMakeLists.txt
@@ -4,6 +4,6 @@ endif()
 
 set(the_description "CUDA-accelerated Object Detection")
 
-ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations -Wshadow)
+ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations -Wshadow -Wstrict-aliasing)
 
 ocv_define_module(cudaobjdetect opencv_objdetect opencv_cudaarithm opencv_cudawarping OPTIONAL opencv_cudalegacy WRAP python)
diff --git a/modules/cudaobjdetect/src/cuda/hog.cu b/modules/cudaobjdetect/src/cuda/hog.cu
@@ -448,7 +448,7 @@ namespace cv { namespace cuda { namespace device
            compute_confidence_hists_kernel_many_blocks<nthreads, nblocks><<<grid, threads>>>(
                    img_win_width, img_block_width, win_block_stride_x, win_block_stride_y,
                    block_hists, coefs, free_coef, threshold, confidences);
-           cudaSafeCall(cudaThreadSynchronize());
+           cudaSafeCall(cudaDeviceSynchronize());
        }
 
 
diff --git a/modules/cudaoptflow/CMakeLists.txt b/modules/cudaoptflow/CMakeLists.txt
@@ -4,7 +4,7 @@ endif()
 
 set(the_description "CUDA-accelerated Optical Flow")
 
-ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations -Wshadow)
+ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4127 /wd4324 /wd4512 -Wundef -Wmissing-declarations -Wshadow -Wstrict-aliasing)
 
 ocv_define_module(cudaoptflow opencv_video opencv_optflow opencv_cudaarithm opencv_cudawarping opencv_cudaimgproc OPTIONAL opencv_cudalegacy WRAP python)
 

Original file line number	Diff line number	Diff line change
`@@ -448,7 +448,7 @@ namespace cv { namespace cuda { namespace device`
`448`	`448`	`compute_confidence_hists_kernel_many_blocks<nthreads, nblocks><<<grid, threads>>>(`
`449`	`449`	`img_win_width, img_block_width, win_block_stride_x, win_block_stride_y,`
`450`	`450`	`block_hists, coefs, free_coef, threshold, confidences);`
`451`		`- cudaSafeCall(cudaThreadSynchronize());`
	`451`	`+ cudaSafeCall(cudaDeviceSynchronize());`
`452`	`452`	`}`
`453`	`453`
`454`	`454`