diff options
| author |  Ben Wagner <bungeman@google.com> | 2017-11-08 15:37:22 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-08 21:07:27 +0000 |
| commit | 700ff17125f44c43704788722db92d119afc2bfe (patch) | |
| tree | 982d3b9fa369a2f904c0e6e55fdbba8a3468c8dc | |
| parent | f8e2502819499894dff40c4f2f46e46edda15507 (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>
| -rw-r--r-- | docs/SkPaint_Reference.bmh | 2 | ||||
| -rw-r--r-- | site/user/api/SkPaint_Reference.md | 2 | ||||
| -rw-r--r-- | tools/bookmaker/bookmaker.cpp | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/docs/SkPaint_Reference.bmh b/docs/SkPaint_Reference.bmh index aa388d3b09..075fa78eae 100644 --- a/docs/SkPaint_Reference.bmh +++ b/docs/SkPaint_Reference.bmh @@ -3247,7 +3247,7 @@ implementation. #Height 100 void draw(SkCanvas* canvas) { SkPaint paint; - paint.setTypeface(SkTypeface::MakeDefault(SkTypeface::kBold)); + paint.setTypeface(SkTypeface::MakeFromName(nullptr, SkFontStyle())); paint.setAntiAlias(true); paint.setTextSize(36); canvas->drawString("A Big Hello!", 10, 40, paint); diff --git a/site/user/api/SkPaint_Reference.md b/site/user/api/SkPaint_Reference.md index 33a92a7da3..acd01b9fbc 100644 --- a/site/user/api/SkPaint_Reference.md +++ b/site/user/api/SkPaint_Reference.md @@ -3250,7 +3250,7 @@ implementation. ### Example -<div><fiddle-embed name="c18b1696b8c1649bebf7eb1f8b89e0b0"></fiddle-embed></div> +<div><fiddle-embed name="1a7a5062725139760962582f599f1b97"></fiddle-embed></div> <a name="SkPaint_getTypeface"></a> ## getTypeface 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"; |