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

minor fix

Browse Source
This commit is contained in:
Andrey Morozov 2011-10-04 22:00:57 +00:00
parent 99c2326e51
commit 6138956b5e
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/contrib/src/inputoutput.cpp
View File

@ -46,7 +46,7 @@ namespace cv
#else #else
DIR *dp; DIR *dp;
struct dirent *dirp; struct dirent *dirp;
if((dp = opendir(path_f.c_str())) == NULL) if((dp = opendir(path.c_str())) == NULL)
{ {
return list; return list;
} }
@ -54,7 +54,13 @@ namespace cv
while ((dirp = readdir(dp)) != NULL) while ((dirp = readdir(dp)) != NULL)
{ {
if (dirp->d_type == DT_REG) if (dirp->d_type == DT_REG)
{
if (exten.compare("*") == 0)
list.push_back(static_cast<std::string>(dirp->d_name)); list.push_back(static_cast<std::string>(dirp->d_name));
else
if (std::string(dirp->d_name).find(exten) != std::string::npos)
list.push_back(static_cast<std::string>(dirp->d_name));
}
} }
closedir(dp); closedir(dp);
#endif #endif
@ -108,6 +114,10 @@ namespace cv
strcmp(dirp->d_name, ".") != 0 && strcmp(dirp->d_name, ".") != 0 &&
strcmp(dirp->d_name, "..") != 0 ) strcmp(dirp->d_name, "..") != 0 )
{ {
if (exten.compare("*") == 0)
list.push_back(static_cast<std::string>(dirp->d_name));
else
if (std::string(dirp->d_name).find(exten) != std::string::npos)
list.push_back(static_cast<std::string>(dirp->d_name)); list.push_back(static_cast<std::string>(dirp->d_name));
} }
} }