Merge pull request #13947 from JoeHowse:4.0.1-patches

* core, stitching: revise syntax to support Visual C++ 2013

* stitching: revise syntax again to support Visual C++ 2013 and other compilers

* stitching: minor update to clarify changes
This commit is contained in:
JoeHowse
2019-03-02 12:00:32 -04:00
committed by Alexander Alekhin
parent c3cf35ab63
commit c0d41f05d6
3 changed files with 15 additions and 4 deletions
+6
View File
@@ -44,6 +44,12 @@
namespace cv {
#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900/*MSVS 2015*/)
// Stitcher::ORIG_RESOL is initialized in stitching.hpp.
#else
const double Stitcher::ORIG_RESOL = -1.0;
#endif
Ptr<Stitcher> Stitcher::create(Mode mode)
{
Ptr<Stitcher> stitcher = makePtr<Stitcher>();