diff --git a/ChangeLog b/ChangeLog index f8058b7fd..2b47a88a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,11 @@ * Processed pull requests #444-683 from nov14 to sep16: - #693: Reactivated ctest in simplified form - #444 rejected (won't compile) - #446 rejected (won't compile) - #493 rejected (not clear this is the right way to deal with illegal Unicode) - + #693 reactivate ctest in simplified form + #555 fix windows path issue +* Rejected the following old pull requests: + #444 won't compile + #446 won't compile + #493 not clear this is the right way to deal with illegal Unicode v0.14.6 2015.07.22 diff --git a/src/util/path.cc b/src/util/path.cc index 5abc7a590..0bf16609f 100644 --- a/src/util/path.cc +++ b/src/util/path.cc @@ -9,7 +9,7 @@ #include #include #include - +#include #include "path.h" #ifdef __MINGW32__ @@ -114,12 +114,18 @@ bool is_truetype_suffix(const string & suffix) string get_filename (const string & path) { + char* s= basename(strdup(path.c_str())); + std::string str(s); + return str; + + /* size_t idx = path.rfind('/'); if(idx == string::npos) return path; else if (idx == path.size() - 1) return ""; return path.substr(idx + 1); + */ } string get_suffix(const string & path)