opencv/opencv_contrib
1
0
Fork 0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-24 03:03:35 +08:00
Code Issues Releases Wiki Activity

datasets: make or_pascal fail gracefully on absent tags

Browse Source
This commit is contained in:
berak
2016-01-31 07:56:47 +01:00
parent 56eea817af
commit e4acf5a6ce
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
modules/datasets/src/or_pascal.cpp
View File

@@ -61,8 +61,8 @@ public:
private:
void loadDataset(const string &path, const string &nameImageSet, vector< Ptr<Object> > &imageSet);
Ptr<Object> parseAnnotation(const string path, const string id);
const char* parseNodeText(XMLElement* node, const string nodeName, const string defaultValue);
Ptr<Object> parseAnnotation(const string &path, const string &id);
const char* parseNodeText(XMLElement* node, const string &nodeName, const string &defaultValue);
};
@@ -105,17 +105,20 @@ void OR_pascalImp::loadDataset(const string &path, const string &nameImageSet, v
}
}
const char* OR_pascalImp::parseNodeText(XMLElement* node, const string nodeName, const string defaultValue)
const char* OR_pascalImp::parseNodeText(XMLElement* node, const string &nodeName, const string &defaultValue)
{
const char* e = node->FirstChildElement(nodeName.c_str())->GetText();
if( e != 0 )
return e ;
else
XMLElement* child = node->FirstChildElement(nodeName.c_str());
if ( child == 0 )
return defaultValue.c_str();
const char* e = child->GetText();
if( e == 0 )
return defaultValue.c_str();
return e ;
}
Ptr<Object> OR_pascalImp::parseAnnotation(const string path, const string id)
Ptr<Object> OR_pascalImp::parseAnnotation(const string &path, const string &id)
{
string pathAnnotations(path + "Annotations/");
string pathImages(path + "JPEGImages/");