potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

Fix bug with int64 support for FileStorage

Browse Source
This commit is contained in:
MaximSmolskiy
2025-01-28 02:06:58 +03:00
parent 162179748a
commit c99c7c3bfe
2 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/persistence.cpp
+4 -18
View File
@@ -2468,7 +2468,7 @@ size_t FileNode::rawSize() const
p += 4;
size_t sz0 = (size_t)(p - p0);
if( tp == INT )
return sz0 + 4;
return sz0 + 8;
if( tp == REAL )
return sz0 + 8;
if( tp == NONE )
@@ -2502,13 +2502,7 @@ void FileNode::setValue( int type, const void* value, int len )
sz += 4;
if( type == INT )
{
int64_t ival = *(const int64_t*)value;
if (ival > INT_MAX || ival < INT_MIN)
sz += 8;
else
sz += 4;
}
sz += 8;
else if( type == REAL )
sz += 8;
else if( type == STRING )
@@ -2529,10 +2523,7 @@ void FileNode::setValue( int type, const void* value, int len )
if( type == INT )
{
int64_t ival = *(const int64_t*)value;
if (sz > 8)
writeInt(p, ival);
else
writeInt(p, static_cast<int>(ival));
writeInt(p, ival);
}
else if( type == REAL )
{
@@ -2683,7 +2674,7 @@ FileNodeIterator& FileNodeIterator::readRaw( const String& fmt, void* _data0, si
offset = alignSize( offset, elem_size );
uchar* data = data0 + offset;
for( int i = 0; i < count; i++ )
for( int i = 0; i < count; i++, ++(*this) )
{
FileNode node = *(*this);
if( node.isInt() )
@@ -2807,11 +2798,6 @@ FileNodeIterator& FileNodeIterator::readRaw( const String& fmt, void* _data0, si
}
else
CV_Error( Error::StsError, "readRawData can only be used to read plain sequences of numbers" );
++(*this);
if (elem_type == CV_64S)
{
ofs += 4;
}
}
offset = (int)(data - data0);
}