Skip to content

O
opencv
Commit 99c2326e authored by Andrey Morozov's avatar Andrey Morozov
Browse files
Options

minor fix

parent 8a06b20a
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
modules/contrib/src/inputoutput.cpp
View file @ 99c2326e
...@@ -46,7 +46,7 @@ namespace cv ...@@ -46,7 +46,7 @@ namespace cv
#else #else
DIR *dp; DIR *dp;
struct dirent *dirp; struct dirent *dirp;
if((dp = opendir(path.c_str())) == NULL) if((dp = opendir(path_f.c_str())) == NULL)
{ {
return list; return list;
} }
...@@ -54,7 +54,7 @@ namespace cv ...@@ -54,7 +54,7 @@ namespace cv
while ((dirp = readdir(dp)) != NULL) while ((dirp = readdir(dp)) != NULL)
{ {
if (dirp->d_type == DT_REG) if (dirp->d_type == DT_REG)
list.push_back(static_cast<string>(dirp->d_name)); list.push_back(static_cast<std::string>(dirp->d_name));
} }
closedir(dp); closedir(dp);
#endif #endif
...@@ -97,15 +97,19 @@ namespace cv ...@@ -97,15 +97,19 @@ namespace cv
#else #else
DIR *dp; DIR *dp;
struct dirent *dirp; struct dirent *dirp;
if((dp = opendir(path.c_str())) == NULL) if((dp = opendir(path_f.c_str())) == NULL)
{ {
return list; return list;
} }
while ((dirp = readdir(dp)) != NULL) while ((dirp = readdir(dp)) != NULL)
{ {
if (dirp->d_type == DT_DIR) if (dirp->d_type == DT_DIR &&
list.push_back(static_cast<string>(dirp->d_name)); strcmp(dirp->d_name, ".") != 0 &&
strcmp(dirp->d_name, "..") != 0 )
{
list.push_back(static_cast<std::string>(dirp->d_name));
}
} }
closedir(dp); closedir(dp);
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment