aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/bookmaker/bookmaker.cpp
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2017-11-08 15:37:22 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-11-08 21:07:27 +0000
commit700ff17125f44c43704788722db92d119afc2bfe (patch)
tree982d3b9fa369a2f904c0e6e55fdbba8a3468c8dc /tools/bookmaker/bookmaker.cpp
parentf8e2502819499894dff40c4f2f46e46edda15507 (diff)
Bookmaker to work on Linux.
This also updates one fiddle example which used SkTypeface::kBold, which is now private. Change-Id: I799b64bfaa377d02f0a045d2f077410d4f38413d Reviewed-on: https://skia-review.googlesource.com/68902 Reviewed-by: Cary Clark <caryclark@google.com> Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'tools/bookmaker/bookmaker.cpp')
-rw-r--r--tools/bookmaker/bookmaker.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/bookmaker/bookmaker.cpp b/tools/bookmaker/bookmaker.cpp
index ca60084100..b0b052355b 100644
--- a/tools/bookmaker/bookmaker.cpp
+++ b/tools/bookmaker/bookmaker.cpp
@@ -308,9 +308,12 @@ bool Definition::exampleToScript(string* result, ExampleOptions exampleOptions)
code += "}";
}
string example = "\"" + normalizedName + "\": {\n";
- size_t nameStart = fFileName.find("\\", 0);
- SkASSERT(string::npos != nameStart);
- string baseFile = fFileName.substr(nameStart + 1, fFileName.length() - nameStart - 5);
+
+ string baseFile = [this]() {
+ string baseNameExt = fFileName.substr(fFileName.find_last_of("/\\") + 1);
+ size_t p = baseNameExt.find_last_of('.');
+ return (p > 0 && p != string::npos) ? baseNameExt.substr(0, p) : baseNameExt;
+ }();
if (ExampleOptions::kText == exampleOptions) {
example += " \"code\": \"" + code + "\",\n";
example += " \"hash\": \"" + fHash + "\",\n";