From 700ff17125f44c43704788722db92d119afc2bfe Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Wed, 8 Nov 2017 15:37:22 -0500 Subject: 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 Commit-Queue: Ben Wagner --- tools/bookmaker/bookmaker.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tools/bookmaker/bookmaker.cpp') 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"; -- cgit v1.2.3