diff options
| -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"; |