potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2018-10-11 23:40:55 +00:00
parent f1fdfa1a51 28cb714a09
commit 1ed9ff17e1
25 changed files with 2921 additions and 1578 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/stitching/src/matchers.cpp
+4
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