mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 19:20:28 +08:00
Code Issues Actions 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/core/src/persistence_json.cpp
View File

@ -72,7 +72,7 @@ public:
}
char* ptr = fs->bufferPtr();
if( ptr > fs->bufferStart() + current_struct.indent && !FileNode::FileNode::isEmptyCollection(struct_flags) )
if( ptr > fs->bufferStart() + current_struct.indent && !FileNode::isEmptyCollection(struct_flags) )
*ptr++ = ' ';
*ptr++ = FileNode::isMap(struct_flags) ? '}' : ']';
fs->setBufferPtr(ptr);
@ -171,7 +171,7 @@ public:
{
int new_offset;
ptr = fs->bufferPtr();
if( !FileNode::FileNode::isEmptyCollection(struct_flags) )
if( !FileNode::isEmptyCollection(struct_flags) )
*ptr++ = ',';
new_offset = static_cast<int>(ptr - fs->bufferStart() + key_len + data_len);
if( new_offset > fs->wrapMargin() && new_offset - current_struct.indent > 10 )
@ -184,7 +184,7 @@ public:
}
else
{
if ( !FileNode::FileNode::isEmptyCollection(struct_flags) )
if ( !FileNode::isEmptyCollection(struct_flags) )
{
ptr = fs->bufferPtr();
*ptr++ = ',';

7
modules/stitching/include/opencv2/stitching.hpp
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
{

6
modules/stitching/src/stitcher.cpp
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>();