mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-22 11:44:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7867 from alalek:cuda_warnings_2.4

Browse Source 
(2.4) Fix CUDA warnings
This commit is contained in:
Alexander Alekhin 2016-12-15 18:09:12 +02:00 committed by GitHub
commit 667cb2e9fc
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/CMakeLists.txt
View File

@ -29,7 +29,7 @@ if(HAVE_CUDA)
source_group("Src\\NVidia" FILES ${ncv_files})
ocv_include_directories("src/nvidia" "src/nvidia/core" "src/nvidia/NPP_staging" ${CUDA_INCLUDE_DIRS})
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter /wd4211 /wd4201 /wd4100 /wd4505 /wd4408)
ocv_warnings_disable(CMAKE_CXX_FLAGS -Wundef -Wmissing-declarations -Wshadow -Wunused-parameter -Wstrict-aliasing /wd4211 /wd4201 /wd4100 /wd4505 /wd4408)
if(MSVC)
if(NOT ENABLE_NOISY_WARNINGS)

8
modules/gpu/src/nvidia/NCVHaarObjectDetection.hpp
View File

@ -59,6 +59,11 @@
#ifndef _ncvhaarobjectdetection_hpp_
#define _ncvhaarobjectdetection_hpp_
#ifdef __GNUC__
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
#include <string>
#include "NCV.hpp"
@ -458,5 +463,8 @@ NCV_EXPORTS NCVStatus ncvHaarStoreNVBIN_host(const std::string &filename,
NCVVector<HaarFeature64> &h_HaarFeatures);
#ifdef __GNUC__
# pragma GCC diagnostic pop
#endif
#endif // _ncvhaarobjectdetection_hpp_