ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-08 08:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix dirname() implementation of Windows in lottieloader.cpp, and fix basename() implementation by using strrchr() and not strchr()

Browse Source
This commit is contained in:
Vincent Torri 2019-07-01 11:23:26 +02:00 committed by Subhransu
parent 71538bac3a
commit ae933c37af
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/lottie2gif.cpp
View File

@ -110,11 +110,11 @@ public:
baseName = absoloutePath; baseName = absoloutePath;
#ifdef _WIN32 #ifdef _WIN32
char *base = strchr(baseName.data(), '/'); char *base = strrchr(baseName.data(), '/');
if (base) if (base)
{ {
base++; base++;
base = strchr(baseName.data(), '\\'); base = strrchr(baseName.data(), '\\');
if (base) base++; if (base) base++;
else return 1; else return 1;
} }

3
src/lottie/lottieloader.cpp
View File

@ -71,6 +71,9 @@ public:
static std::string dirname(const std::string &path) static std::string dirname(const std::string &path)
{ {
const char *ptr = strrchr(path.c_str(), '/'); const char *ptr = strrchr(path.c_str(), '/');
#ifdef _WIN32
if (ptr) ptr = strrchr(ptr + 1, '\\');
#endif
int len = int(ptr + 1 - path.c_str()); // +1 to include '/' int len = int(ptr + 1 - path.c_str()); // +1 to include '/'
return std::string(path, 0, len); return std::string(path, 0, len);
} }