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

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2024-04-01 17:09:24 +03:00
parent 55426ee195 2eedec7479
commit cb6d295f15
289 changed files with 49794 additions and 38081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/persistence.cpp
+8 -8
View File
@@ -294,7 +294,7 @@ int calcStructSize( const char* dt, int initial_size )
case 'n': { elem_max_size = std::max( elem_max_size, sizeof(unsigned) ); break; }
case 'f': { elem_max_size = std::max( elem_max_size, sizeof(float ) ); break; }
case 'd': { elem_max_size = std::max( elem_max_size, sizeof(double) ); break; }
case 'h': { elem_max_size = std::max( elem_max_size, sizeof(float16_t)); break; }
case 'h': { elem_max_size = std::max( elem_max_size, sizeof(hfloat)); break; }
case 'H': { elem_max_size = std::max( elem_max_size, sizeof(bfloat)); break; }
case 'I': { elem_max_size = std::max( elem_max_size, sizeof(int64_t)); break; }
case 'U': { elem_max_size = std::max( elem_max_size, sizeof(uint64_t)); break; }
@@ -1172,8 +1172,8 @@ void FileStorage::Impl::writeRawData(const std::string &dt, const void *_data, s
data += sizeof(double);
break;
case CV_16F:
ptr = fs::floatToString(buf, sizeof(buf), (float) *(float16_t *) data, true, explicitZero);
data += sizeof(float16_t);
ptr = fs::floatToString(buf, sizeof(buf), (float) *(hfloat *) data, true, explicitZero);
data += sizeof(hfloat);
break;
case CV_16BF:
ptr = fs::floatToString(buf, sizeof(buf), (float) *(bfloat *) data, true, explicitZero);
@@ -1856,7 +1856,7 @@ char *FileStorage::Impl::parseBase64(char *ptr, int indent, FileNode &collection
node_type = FileNode::REAL;
break;
case CV_16F:
fval = (float) float16_t::fromBits(base64decoder.getUInt16());
fval = float(hfloatFromBits(base64decoder.getUInt16()));
node_type = FileNode::REAL;
break;
default:
@@ -2663,8 +2663,8 @@ FileNodeIterator& FileNodeIterator::readRaw( const String& fmt, void* _data0, si
data += sizeof(double);
break;
case CV_16F:
*(float16_t*)data = float16_t((float)ival);
data += sizeof(float16_t);
*(hfloat*)data = hfloat((float)ival);
data += sizeof(hfloat);
break;
case CV_16BF:
*(bfloat*)data = bfloat((float)ival);
@@ -2721,8 +2721,8 @@ FileNodeIterator& FileNodeIterator::readRaw( const String& fmt, void* _data0, si
data += sizeof(double);
break;
case CV_16F:
*(float16_t*)data = float16_t((float)fval);
data += sizeof(float16_t);
*(hfloat*)data = hfloat((float)fval);
data += sizeof(hfloat);
break;
case CV_16BF:
*(bfloat*)data = bfloat((float)fval);