generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use full qualified name for all internal namespaces to prevent ambiguous symbol errors

Browse Source
This commit is contained in:
Vladislav Vinogradov
2015-02-16 11:31:21 +03:00
parent 5466e321b8
commit a932d8aba1
7 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/algorithm.cpp
View File

@@ -423,7 +423,7 @@ void AlgorithmInfo::write(const Algorithm* algo, FileStorage& fs) const
cv::write(fs, pname, algo->get<std::vector<Mat> >(pname));
else if( p.type == Param::ALGORITHM )
{
internal::WriteStructContext ws(fs, pname, CV_NODE_MAP);
cv::internal::WriteStructContext ws(fs, pname, CV_NODE_MAP);
Ptr<Algorithm> nestedAlgo = algo->get<Algorithm>(pname);
nestedAlgo->write(fs);
}

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

@@ -5548,7 +5548,7 @@ void read( const FileNode& node, SparseMat& mat, const SparseMat& default_mat )
void write(FileStorage& fs, const String& objname, const std::vector<KeyPoint>& keypoints)
{
internal::WriteStructContext ws(fs, objname, CV_NODE_SEQ + CV_NODE_FLOW);
cv::internal::WriteStructContext ws(fs, objname, CV_NODE_SEQ + CV_NODE_FLOW);
int i, npoints = (int)keypoints.size();
for( i = 0; i < npoints; i++ )