third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13947 from JoeHowse:4.0.1-patches

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
modules/stitching/include/opencv2/stitching.hpp
+6 -1
View File
@@ -142,7 +142,12 @@ public:
* When setting a resolution for stitching, this values is a placeholder
* for preserving the original resolution.
*/
static constexpr const double ORIG_RESOL = -1.0;
#if __cplusplus >= 201103L || (defined(_MSC_VER) && _MSC_VER >= 1900/*MSVS 2015*/)
static constexpr double ORIG_RESOL = -1.0;
#else
// support MSVS 2013
static const double ORIG_RESOL; // Initialized in stitcher.cpp
#endif
enum Status
{