size_t remaining = it->remaining;
size_t cn = DataType<_Tp>::channels;
int _fmt = traits::SafeFmt<_Tp>::fmt;
+ CV_Assert((_fmt >> 8) < 9);
char fmt[] = { (char)((_fmt >> 8)+'1'), (char)_fmt, '\0' };
+ CV_Assert((remaining % cn) == 0);
size_t remaining1 = remaining / cn;
count = count < remaining1 ? count : remaining1;
vec.resize(count);
if (first_node.isSeq())
{
// 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();
it >> keypoints;
+#endif
return;
}
keypoints.clear();
if (first_node.isSeq())
{
// 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();
it >> matches;
+#endif
return;
}
matches.clear();
EXPECT_NO_THROW(fs << "dvv" << dvv);
cv::String fs_result = fs.releaseAndGetString();
+#ifndef OPENCV_TRAITS_ENABLE_DEPRECATED
#if defined _MSC_VER && _MSC_VER <= 1700 /* MSVC 2012 and older */
EXPECT_STREQ(fs_result.c_str(),
"%YAML:1.0\n"
" - [ 1, 2, 3, -1.5000000000000000e+00 ]\n"
);
#endif
+#endif // OPENCV_TRAITS_ENABLE_DEPRECATED
cv::FileStorage fs_read(fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY);
EXPECT_NO_THROW(fs << "kvv" << kvv);
cv::String fs_result = fs.releaseAndGetString();
+#ifndef OPENCV_TRAITS_ENABLE_DEPRECATED
EXPECT_STREQ(fs_result.c_str(),
"<?xml version=\"1.0\"?>\n"
"<opencv_storage>\n"
" 1. 2. 16. 0. 100. 1 -1</_></_></kvv>\n"
"</opencv_storage>\n"
);
+#endif //OPENCV_TRAITS_ENABLE_DEPRECATED
cv::FileStorage fs_read(fs_result, cv::FileStorage::READ | cv::FileStorage::MEMORY);