mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 05:29:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed two bugs that I caused.

Browse Source
This commit is contained in:
MYLS 2016-08-05 16:15:03 +08:00
parent 86238d2748
commit 1da8a19af3
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/core/src/persistence.cpp
View File

@ -1176,13 +1176,13 @@ static void check_if_write_struct_is_delayed( CvFileStorage* fs, bool change_typ
std::string type_name;
int struct_flags = fs->delayed_struct_flags;
if ( fs->delayed_struct_key != 0 && *fs->delayed_type_name != '\0' )
if ( fs->delayed_struct_key != 0 && *fs->delayed_struct_key != '\0' )
{
struct_key.assign(fs->delayed_struct_key);
}
if ( fs->delayed_type_name != 0 && *fs->delayed_type_name != '\0' )
{
struct_key.assign(fs->delayed_type_name);
type_name.assign(fs->delayed_type_name);
}
/* reset */
@ -1949,6 +1949,9 @@ icvYMLStartWriteStruct( CvFileStorage* fs, const char* key, int struct_flags,
char buf[CV_FS_MAX_LEN + 1024];
const char* data = 0;
if ( type_name && *type_name == '\0' )
type_name = 0;
struct_flags = (struct_flags & (CV_NODE_TYPE_MASK|CV_NODE_FLOW)) | CV_NODE_EMPTY;
if( !CV_NODE_IS_COLLECTION(struct_flags))
CV_Error( CV_StsBadArg,
@ -2914,6 +2917,9 @@ icvXMLStartWriteStruct( CvFileStorage* fs, const char* key, int struct_flags,
CV_Error( CV_StsBadArg,
"Some collection type: CV_NODE_SEQ or CV_NODE_MAP must be specified" );
if ( type_name && *type_name == '\0' )
type_name = 0;
if( type_name )
{
attr[idx++] = "type_id";