Merge pull request #12794 from alalek:fix_warnings

This commit is contained in:
Alexander Alekhin 2018-10-10 20:22:07 +00:00
commit 761c269e47

View File

@ -52,6 +52,10 @@ using namespace cv::cuda;
#include "opencv2/xfeatures2d.hpp"
using xfeatures2d::SURF;
using xfeatures2d::SIFT;
#else
# if defined(_MSC_VER)
# pragma warning(disable:4702) // unreachable code
# endif
#endif
#ifdef HAVE_OPENCV_CUDAIMGPROC