mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-13 13:13:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10293 from alalek:fix_persistence_with_deprecated_traits

Browse Source
This commit is contained in:
Vadim Pisarevsky 2017-12-13 17:30:23 +00:00
commit 99183e98d3
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/include/opencv2/core/persistence.hpp
View File

@ -851,7 +851,9 @@ namespace internal
size_t remaining = it->remaining; size_t remaining = it->remaining;
size_t cn = DataType<_Tp>::channels; size_t cn = DataType<_Tp>::channels;
int _fmt = traits::SafeFmt<_Tp>::fmt; int _fmt = traits::SafeFmt<_Tp>::fmt;
CV_Assert((_fmt >> 8) < 9);
char fmt[] = { (char)((_fmt >> 8)+'1'), (char)_fmt, '\0' }; char fmt[] = { (char)((_fmt >> 8)+'1'), (char)_fmt, '\0' };
CV_Assert((remaining % cn) == 0);
size_t remaining1 = remaining / cn; size_t remaining1 = remaining / cn;
count = count < remaining1 ? count : remaining1; count = count < remaining1 ? count : remaining1;
vec.resize(count); vec.resize(count);

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

@ -7367,8 +7367,18 @@ void read(const FileNode& node, std::vector<KeyPoint>& keypoints)
if (first_node.isSeq()) if (first_node.isSeq())
{ {
// modern scheme // modern scheme
#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
FileNodeIterator it = node.begin();
size_t total = (size_t)it.remaining;
keypoints.resize(total);
for (size_t i = 0; i < total; ++i, ++it)
{
(*it) >> keypoints[i];
}
#else
FileNodeIterator it = node.begin(); FileNodeIterator it = node.begin();
it >> keypoints; it >> keypoints;
#endif
return; return;
} }
keypoints.clear(); keypoints.clear();
@ -7394,8 +7404,18 @@ void read(const FileNode& node, std::vector<DMatch>& matches)
if (first_node.isSeq()) if (first_node.isSeq())
{ {
// modern scheme // modern scheme
#ifdef OPENCV_TRAITS_ENABLE_DEPRECATED
FileNodeIterator it = node.begin();
size_t total = (size_t)it.remaining;
matches.resize(total);
for (size_t i = 0; i < total; ++i, ++it)
{
(*it) >> matches[i];
}
#else
FileNodeIterator it = node.begin(); FileNodeIterator it = node.begin();
it >> matches; it >> matches;
#endif
return; return;
} }
matches.clear(); matches.clear();

4
modules/core/test/test_io.cpp
View File

@ -1199,6 +1199,7 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector_vector)
EXPECT_NO_THROW(fs << "dvv" << dvv); EXPECT_NO_THROW(fs << "dvv" << dvv);
cv::String fs_result = fs.releaseAndGetString(); cv::String fs_result = fs.releaseAndGetString();
#ifndef OPENCV_TRAITS_ENABLE_DEPRECATED
#if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */ #if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */
EXPECT_STREQ(fs_result.c_str(), EXPECT_STREQ(fs_result.c_str(),
"%YAML:1.0\n" "%YAML:1.0\n"
@ -1226,6 +1227,7 @@ TEST(Core_InputOutput, FileStorage_DMatch_vector_vector)
" - [ 1, 2, 3, -1.5000000000000000e+00 ]\n" " - [ 1, 2, 3, -1.5000000000000000e+00 ]\n"
); );
#endif #endif
#endif // OPENCV_TRAITS_ENABLE_DEPRECATED
cv::FileStorage fs_read(fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY); cv::FileStorage fs_read(fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY);
@ -1344,6 +1346,7 @@ TEST(Core_InputOutput, FileStorage_KeyPoint_vector_vector)
EXPECT_NO_THROW(fs << "kvv" << kvv); EXPECT_NO_THROW(fs << "kvv" << kvv);
cv::String fs_result = fs.releaseAndGetString(); cv::String fs_result = fs.releaseAndGetString();
#ifndef OPENCV_TRAITS_ENABLE_DEPRECATED
EXPECT_STREQ(fs_result.c_str(), EXPECT_STREQ(fs_result.c_str(),
"<?xml version=\"1.0\"?>\n" "<?xml version=\"1.0\"?>\n"
"<opencv_storage>\n" "<opencv_storage>\n"
@ -1362,6 +1365,7 @@ TEST(Core_InputOutput, FileStorage_KeyPoint_vector_vector)
" 1. 2. 16. 0. 100. 1 -1</_></_></kvv>\n" " 1. 2. 16. 0. 100. 1 -1</_></_></kvv>\n"
"</opencv_storage>\n" "</opencv_storage>\n"
); );
#endif //OPENCV_TRAITS_ENABLE_DEPRECATED
cv::FileStorage fs_read(fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY); cv::FileStorage fs_read(fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY);