提交 9de63c1e 编写于 作者: M Maksim Shabunin

Made FileNode::operator string inline

上级 51cc78b2
......@@ -565,7 +565,7 @@ public:
//! returns the node content as double
operator double() const;
//! returns the node content as text string
operator std::string() const;
inline operator std::string() const { return this->string(); }
static bool isMap(int flags);
static bool isSeq(int flags);
......@@ -599,7 +599,7 @@ public:
//! Simplified reading API to use with bindings.
CV_WRAP double real() const;
//! Simplified reading API to use with bindings.
CV_WRAP String string() const;
CV_WRAP std::string string() const;
//! Simplified reading API to use with bindings.
CV_WRAP Mat mat() const;
......
......@@ -2197,7 +2197,8 @@ FileNode::operator double() const
return DBL_MAX;
}
FileNode::operator std::string() const
double FileNode::real() const { return double(*this); }
std::string FileNode::string() const
{
const uchar* p = ptr();
if( !p || (*p & TYPE_MASK) != STRING )
......@@ -2206,9 +2207,6 @@ FileNode::operator std::string() const
size_t sz = (size_t)(unsigned)readInt(p);
return std::string((const char*)(p + 4), sz - 1);
}
double FileNode::real() const { return double(*this); }
std::string FileNode::string() const { return std::string(*this); }
Mat FileNode::mat() const { Mat value; read(*this, value, Mat()); return value; }
FileNodeIterator FileNode::begin() const { return FileNodeIterator(*this, false); }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册