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

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2020-02-20 19:45:21 +03:00
parent 1f695c4532 150c29356a
commit 96b26dc8f4
28 changed files with 1115 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/persistence_yml.cpp
+4 -4
View File
@@ -452,19 +452,19 @@ public:
if ( d == '<') //support of full type heading from YAML 1.2
{
const char* yamlTypeHeading = "<tag:yaml.org,2002:";
const size_t headingLenght = strlen(yamlTypeHeading);
const size_t headingLength = strlen(yamlTypeHeading);
char* typeEndPtr = ++ptr;
do d = *++typeEndPtr;
while( cv_isprint(d) && d != ' ' && d != '>' );
if ( d == '>' && (size_t)(typeEndPtr - ptr) > headingLenght )
if ( d == '>' && (size_t)(typeEndPtr - ptr) > headingLength )
{
if ( memcmp(ptr, yamlTypeHeading, headingLenght) == 0 )
if ( memcmp(ptr, yamlTypeHeading, headingLength) == 0 )
{
*typeEndPtr = ' ';
ptr += headingLenght - 1;
ptr += headingLength - 1;
is_user = true;
//value_type |= FileNode::USER;
}