potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #7854 from alalek:backports_2016

Browse Source 
(2.4) Backports from master branch (#7854)
This commit is contained in:
Alexander Alekhin
2016-12-15 18:09:44 +02:00
committed by GitHub
parent 49e6bb2993
commit cc09f5a7de
61 changed files with 1546 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/stitching/include/opencv2/stitching/stitcher.hpp
+9
View File
@@ -43,6 +43,11 @@
#ifndef __OPENCV_STITCHING_STITCHER_HPP__
#define __OPENCV_STITCHING_STITCHER_HPP__
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Woverloaded-virtual"
#endif
#include "opencv2/core/core.hpp"
#include "opencv2/features2d/features2d.hpp"
#include "opencv2/stitching/warpers.hpp"
@@ -171,4 +176,8 @@ private:
} // namespace cv
#if defined(__clang__)
#pragma clang diagnostic pop
#endif
#endif // __OPENCV_STITCHING_STITCHER_HPP__