Fix ifs that were always true

This commit is contained in:
araml
2017-03-06 12:14:15 -03:00
parent d317cb9e71
commit 2006c5dc60

View File

@@ -118,37 +118,37 @@ namespace alpr
lastslash = 0; lastslash = 0;
else else
lastslash += 1; lastslash += 1;
int lastindex = filename.find_last_of("."); int lastindex = filename.find_last_of(".");
return filename.substr(lastslash, lastindex - lastslash); return filename.substr(lastslash, lastindex - lastslash);
} }
std::string get_filename_from_path(std::string file_path) std::string get_filename_from_path(std::string file_path)
{ {
size_t found; size_t found;
found=file_path.find_last_of("/\\"); found=file_path.find_last_of("/\\");
if (found >= 0) if (found != std::string::npos)
return file_path.substr(found+1); return file_path.substr(found+1);
return ""; return "";
} }
std::string get_directory_from_path(std::string file_path) std::string get_directory_from_path(std::string file_path)
{ {
if (DirectoryExists(file_path.c_str())) if (DirectoryExists(file_path.c_str()))
return file_path; return file_path;
size_t found; size_t found;
found=file_path.find_last_of("/\\"); found=file_path.find_last_of("/\\");
if (found >= 0) if (found != std::string::npos)
return file_path.substr(0,found); return file_path.substr(0,found);
return ""; return "";
} }
@@ -163,9 +163,9 @@ namespace alpr
std::replace(candidate_path.begin(), candidate_path.end(), '/', '\\'); std::replace(candidate_path.begin(), candidate_path.end(), '/', '\\');
system(candidate_path.c_str()); system(candidate_path.c_str());
return true; return true;
} }
FileInfo getFileInfo(std::string filename) { FileInfo getFileInfo(std::string filename) {
FileInfo response; FileInfo response;
response.creation_time = 0; response.creation_time = 0;
response.size = 0; response.size = 0;
@@ -177,7 +177,7 @@ namespace alpr
FileInfo getFileInfo(std::string filename) FileInfo getFileInfo(std::string filename)
{ {
FileInfo response; FileInfo response;
struct stat stat_buf; struct stat stat_buf;
int rc = stat(filename.c_str(), &stat_buf); int rc = stat(filename.c_str(), &stat_buf);
//return rc == 0 ? stat_buf.st_size : -1; //return rc == 0 ? stat_buf.st_size : -1;
@@ -198,7 +198,7 @@ namespace alpr
response.creation_time = 0; response.creation_time = 0;
response.size = 0; response.size = 0;
} }
return response; return response;
} }