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/core/src/persistence_json.cpp
+3 -3
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++ = ',';