diff options
author | 2017-12-08 14:25:14 -0500 | |
---|---|---|
committer | 2017-12-08 20:03:18 +0000 | |
commit | 53e5e7d4ce9d203fadc36b6349bcbb68862f0d22 (patch) | |
tree | 912eaf887571f76ecd3cf352352d46bc12bc347f /gm | |
parent | 5093a539def3ae09df324018f2343827009b2e05 (diff) |
resources: resource identifiers don't begin with leading slash
Change-Id: I52522ffffbf0f5176ac9156cd563b41d6fdde59f
Reviewed-on: https://skia-review.googlesource.com/82940
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'gm')
-rw-r--r-- | gm/fontscalerdistortable.cpp | 2 | ||||
-rw-r--r-- | gm/mixedtextblobs.cpp | 2 | ||||
-rw-r--r-- | gm/poly2poly.cpp | 2 | ||||
-rw-r--r-- | gm/textblobmixedsizes.cpp | 2 | ||||
-rw-r--r-- | gm/typeface.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/gm/fontscalerdistortable.cpp b/gm/fontscalerdistortable.cpp index 64bb9bc44d..49d254de36 100644 --- a/gm/fontscalerdistortable.cpp +++ b/gm/fontscalerdistortable.cpp @@ -35,7 +35,7 @@ protected: paint.setLCDRenderText(true); sk_sp<SkFontMgr> fontMgr(SkFontMgr::RefDefault()); - std::unique_ptr<SkStreamAsset> distortable(GetResourceAsStream("/fonts/Distortable.ttf")); + std::unique_ptr<SkStreamAsset> distortable(GetResourceAsStream("fonts/Distortable.ttf")); if (!distortable) { return; } diff --git a/gm/mixedtextblobs.cpp b/gm/mixedtextblobs.cpp index 887bd5bf17..9e8ff46169 100644 --- a/gm/mixedtextblobs.cpp +++ b/gm/mixedtextblobs.cpp @@ -42,7 +42,7 @@ protected: void onOnceBeforeDraw() override { fEmojiTypeface = sk_tool_utils::emoji_typeface(); fEmojiText = sk_tool_utils::emoji_sample_text(); - fReallyBigATypeface = MakeResourceAsTypeface("/fonts/ReallyBigA.ttf"); + fReallyBigATypeface = MakeResourceAsTypeface("fonts/ReallyBigA.ttf"); SkTextBlobBuilder builder; diff --git a/gm/poly2poly.cpp b/gm/poly2poly.cpp index 2b9b390eb1..6fb96df707 100644 --- a/gm/poly2poly.cpp +++ b/gm/poly2poly.cpp @@ -224,7 +224,7 @@ protected: } void onOnceBeforeDraw() override { - fEmFace = MakeResourceAsTypeface("/fonts/Em.ttf"); + fEmFace = MakeResourceAsTypeface("fonts/Em.ttf"); } void onDraw(SkCanvas* canvas) override { diff --git a/gm/textblobmixedsizes.cpp b/gm/textblobmixedsizes.cpp index 33f1082f31..d5c87eeb34 100644 --- a/gm/textblobmixedsizes.cpp +++ b/gm/textblobmixedsizes.cpp @@ -35,7 +35,7 @@ protected: paint.setAntiAlias(true); paint.setSubpixelText(true); paint.setLCDRenderText(true); - paint.setTypeface(MakeResourceAsTypeface("/fonts/HangingS.ttf")); + paint.setTypeface(MakeResourceAsTypeface("fonts/HangingS.ttf")); const char* text = "Skia"; diff --git a/gm/typeface.cpp b/gm/typeface.cpp index aa90a8486f..f9459a9e42 100644 --- a/gm/typeface.cpp +++ b/gm/typeface.cpp @@ -257,7 +257,7 @@ static void draw_typeface_rendering_gm(SkCanvas* canvas, sk_sp<SkTypeface> face, DEF_SIMPLE_GM_BG_NAME(typefacerendering, canvas, 640, 680, SK_ColorWHITE, SkStringPrintf("typefacerendering%s", sk_tool_utils::platform_font_manager())) { - if (sk_sp<SkTypeface> face = MakeResourceAsTypeface("/fonts/hintgasp.ttf")) { + if (sk_sp<SkTypeface> face = MakeResourceAsTypeface("fonts/hintgasp.ttf")) { draw_typeface_rendering_gm(canvas, std::move(face)); } } |