aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bench/TextBench.cpp2
-rw-r--r--docs/SkPaint_Reference.bmh2
-rw-r--r--gm/fontscalerdistortable.cpp2
-rw-r--r--gm/mixedtextblobs.cpp2
-rw-r--r--gm/poly2poly.cpp2
-rw-r--r--gm/textblobmixedsizes.cpp2
-rw-r--r--gm/typeface.cpp2
-rw-r--r--samplecode/SampleChineseFling.cpp2
-rw-r--r--site/user/api/SkPaint_Reference.md2
-rw-r--r--tests/FontHostTest.cpp4
-rw-r--r--tests/TypefaceTest.cpp8
-rw-r--r--tools/sk_tool_utils.cpp2
12 files changed, 16 insertions, 16 deletions
diff --git a/bench/TextBench.cpp b/bench/TextBench.cpp
index 6e9df4afc7..c28f5d77a5 100644
--- a/bench/TextBench.cpp
+++ b/bench/TextBench.cpp
@@ -71,7 +71,7 @@ protected:
void onDelayedSetup() override {
if (fDoColorEmoji) {
SkASSERT(kBW == fFQ);
- fColorEmojiTypeface = MakeResourceAsTypeface("/fonts/Funkster.ttf");
+ fColorEmojiTypeface = MakeResourceAsTypeface("fonts/Funkster.ttf");
}
if (fDoPos) {
diff --git a/docs/SkPaint_Reference.bmh b/docs/SkPaint_Reference.bmh
index 4a5da73ca4..9d27cec5f9 100644
--- a/docs/SkPaint_Reference.bmh
+++ b/docs/SkPaint_Reference.bmh
@@ -1394,7 +1394,7 @@ kEmbeddedBitmapText_Flag at compile time.
SkPaint paint;
paint.setAntiAlias(true);
paint.setTextSize(13);
- paint.setTypeface(MakeResourceAsTypeface("/fonts/hintgasp.ttf"));
+ paint.setTypeface(MakeResourceAsTypeface("fonts/hintgasp.ttf"));
for (bool embedded : { false, true}) {
paint.setEmbeddedBitmapText(embedded);
offscreen.drawString("A", embedded ? 5 : 15, 15, paint);
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));
}
}
diff --git a/samplecode/SampleChineseFling.cpp b/samplecode/SampleChineseFling.cpp
index fb9ba29885..01366316d0 100644
--- a/samplecode/SampleChineseFling.cpp
+++ b/samplecode/SampleChineseFling.cpp
@@ -27,7 +27,7 @@ static void make_paint(SkPaint* paint, sk_sp<SkTypeface> typeface) {
static sk_sp<SkTypeface> chinese_typeface() {
#ifdef SK_BUILD_FOR_ANDROID
- return MakeResourceAsTypeface("/fonts/NotoSansCJK-Regular.ttc");
+ return MakeResourceAsTypeface("fonts/NotoSansCJK-Regular.ttc");
#elif defined(SK_BUILD_FOR_WIN32)
return SkTypeface::MakeFromName("SimSun", SkFontStyle());
#elif defined(SK_BUILD_FOR_MAC)
diff --git a/site/user/api/SkPaint_Reference.md b/site/user/api/SkPaint_Reference.md
index d2609874cb..ecd85e939f 100644
--- a/site/user/api/SkPaint_Reference.md
+++ b/site/user/api/SkPaint_Reference.md
@@ -1376,7 +1376,7 @@ void draw(SkCanvas* canvas) {<div>The "hintgasp" TrueType font in the Skia resou
SkPaint paint;
paint.setAntiAlias(true);
paint.setTextSize(13);
- paint.setTypeface(MakeResourceAsTypeface("/fonts/hintgasp.ttf"));
+ paint.setTypeface(MakeResourceAsTypeface("fonts/hintgasp.ttf"));
for (bool embedded : { false, true}) {
paint.setEmbeddedBitmapText(embedded);
offscreen.drawString("A", embedded ? 5 : 15, 15, paint);
diff --git a/tests/FontHostTest.cpp b/tests/FontHostTest.cpp
index 3d54c57fe7..3285198931 100644
--- a/tests/FontHostTest.cpp
+++ b/tests/FontHostTest.cpp
@@ -139,7 +139,7 @@ static void test_fontstream(skiatest::Reporter* reporter, SkStream* stream, int
}
static void test_fontstream(skiatest::Reporter* reporter) {
- std::unique_ptr<SkStreamAsset> stream(GetResourceAsStream("/fonts/test.ttc"));
+ std::unique_ptr<SkStreamAsset> stream(GetResourceAsStream("fonts/test.ttc"));
if (!stream) {
SkDebugf("Skipping FontHostTest::test_fontstream\n");
return;
@@ -158,7 +158,7 @@ static void test_symbolfont(skiatest::Reporter* reporter) {
SkUnichar c = 0xf021;
uint16_t g;
SkPaint paint;
- paint.setTypeface(MakeResourceAsTypeface("/fonts/SpiderSymbol.ttf"));
+ paint.setTypeface(MakeResourceAsTypeface("fonts/SpiderSymbol.ttf"));
paint.setTextEncoding(SkPaint::kUTF32_TextEncoding);
paint.textToGlyphs(&c, 4, &g);
diff --git a/tests/TypefaceTest.cpp b/tests/TypefaceTest.cpp
index 591b437ca5..fc81e84926 100644
--- a/tests/TypefaceTest.cpp
+++ b/tests/TypefaceTest.cpp
@@ -78,9 +78,9 @@ static void TypefaceStyle_test(skiatest::Reporter* reporter,
newStyle.width() == 5);
}
DEF_TEST(TypefaceStyle, reporter) {
- std::unique_ptr<SkStreamAsset> stream(GetResourceAsStream("/fonts/Em.ttf"));
+ std::unique_ptr<SkStreamAsset> stream(GetResourceAsStream("fonts/Em.ttf"));
if (!stream) {
- REPORT_FAILURE(reporter, "/fonts/Em.ttf", SkString("Cannot load resource"));
+ REPORT_FAILURE(reporter, "fonts/Em.ttf", SkString("Cannot load resource"));
return;
}
sk_sp<SkData> data(SkData::MakeFromStream(stream.get(), stream->getLength()));
@@ -95,7 +95,7 @@ DEF_TEST(TypefaceStyle, reporter) {
}
DEF_TEST(TypefaceAxes, reporter) {
- std::unique_ptr<SkStreamAsset> distortable(GetResourceAsStream("/fonts/Distortable.ttf"));
+ std::unique_ptr<SkStreamAsset> distortable(GetResourceAsStream("fonts/Distortable.ttf"));
if (!distortable) {
REPORT_FAILURE(reporter, "distortable", SkString());
return;
@@ -138,7 +138,7 @@ DEF_TEST(TypefaceAxes, reporter) {
}
DEF_TEST(TypefaceVariationIndex, reporter) {
- std::unique_ptr<SkStreamAsset> distortable(GetResourceAsStream("/fonts/Distortable.ttf"));
+ std::unique_ptr<SkStreamAsset> distortable(GetResourceAsStream("fonts/Distortable.ttf"));
if (!distortable) {
REPORT_FAILURE(reporter, "distortable", SkString());
return;
diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp
index a025209166..bbb00bc123 100644
--- a/tools/sk_tool_utils.cpp
+++ b/tools/sk_tool_utils.cpp
@@ -54,7 +54,7 @@ sk_sp<SkTypeface> emoji_typeface() {
return SkTypeface::MakeFromName("Apple Color Emoji", SkFontStyle());
#else
- return MakeResourceAsTypeface("/fonts/Funkster.ttf");
+ return MakeResourceAsTypeface("fonts/Funkster.ttf");
#endif
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-29 07:15:24 +0000