From 1c99ea8ed80ca492397717b57e2735869be38c69 Mon Sep 17 00:00:00 2001 From: tfarina Date: Wed, 11 Jun 2014 08:58:50 -0700 Subject: Cleanup: Delete sk_tools::get_basename() in favor of SkOSPath::SkBasename(). BUG=None TEST=make tests && out/Debug/tests R=epoger@google.com Author: tfarina@chromium.org Review URL: https://codereview.chromium.org/321693002 --- tools/picture_utils.cpp | 41 ----------------------------------------- 1 file changed, 41 deletions(-) (limited to 'tools/picture_utils.cpp') diff --git a/tools/picture_utils.cpp b/tools/picture_utils.cpp index 4e6c81e417..850e21f8e7 100644 --- a/tools/picture_utils.cpp +++ b/tools/picture_utils.cpp @@ -14,14 +14,6 @@ #include "SkStream.h" #include "SkString.h" -static bool is_path_seperator(const char chr) { -#if defined(SK_BUILD_FOR_WIN) - return chr == '\\' || chr == '/'; -#else - return chr == '/'; -#endif -} - namespace sk_tools { void force_all_opaque(const SkBitmap& bitmap) { SkASSERT(NULL == bitmap.getTexture()); @@ -58,39 +50,6 @@ namespace sk_tools { path->append(name); } - void get_basename(SkString* basename, const SkString& path) { - if (path.size() == 0) { - basename->reset(); - return; - } - - size_t end = path.size() - 1; - - // Paths pointing to directories often have a trailing slash, - // we remove it so the name is not empty - if (is_path_seperator(path[end])) { - if (end == 0) { - basename->reset(); - return; - } - - end -= 1; - } - - size_t i = end; - do { - --i; - if (is_path_seperator(path[i])) { - const char* basenameStart = path.c_str() + i + 1; - size_t basenameLength = end - i; - basename->set(basenameStart, basenameLength); - return; - } - } while (i > 0); - - basename->set(path.c_str(), end + 1); - } - bool is_percentage(const char* const string) { SkString skString(string); return skString.endsWith("%"); -- cgit v1.2.3