some bugfixes for silly compile errors and painting issues in windoze

This commit is contained in:
Mark Vejvoda
2010-05-04 08:15:16 +00:00
parent 4b1a392f00
commit 605dd746c0
5 changed files with 51 additions and 15 deletions

View File

@@ -558,9 +558,32 @@ vector<std::pair<string,int32> > getFolderTreeContentsCheckSumListRecursively(co
return crcTreeCache[cacheKey];
}
string extractFileFromDirectoryPath(string filename)
{
size_t lastDirectory_Win = filename.find_last_of('\\');
size_t lastDirectory_Lin = filename.find_last_of('/');
size_t lastDirectory = (lastDirectory_Win<lastDirectory_Lin)?lastDirectory_Lin:lastDirectory_Win;
//return filename.substr( 0, filename.rfind("/")+1 );
if (lastDirectory == string::npos) {
return filename;
}
return filename.erase( 0, lastDirectory + 1);
}
string extractDirectoryPathFromFile(string filename)
{
return filename.substr( 0, filename.rfind("/")+1 );
size_t lastDirectory_Win = filename.find_last_of('\\');
size_t lastDirectory_Lin = filename.find_last_of('/');
size_t lastDirectory = (lastDirectory_Win<lastDirectory_Lin)?lastDirectory_Lin:lastDirectory_Win;
//return filename.substr( 0, filename.rfind("/")+1 );
if (lastDirectory == string::npos) {
return "";
}
return filename.substr( 0, lastDirectory + 1);
}
string extractExtension(const string& filepath) {