From c8c99dc32e4db207d911c24f094aaa4111ab9c33 Mon Sep 17 00:00:00 2001 From: nieyuyao Date: Sun, 30 Jul 2023 18:31:54 +0800 Subject: [PATCH] chore(deps): upgrade skia to m116 --- .gitmodules | 2 +- __test__/pathkit.spec.ts | 4 +-- __test__/svg-canvas.spec.ts.md | 2 +- __test__/svg-canvas.spec.ts.snap | Bin 8349 -> 8351 bytes index.js | 4 +-- scripts/build-skia.js | 8 +++--- skia | 2 +- skia-c/skia_c.cpp | 42 +++++++++++++++++++++---------- skia-c/skia_c.hpp | 6 +++-- src/global_fonts.rs | 4 +-- src/sk.rs | 6 +++-- 11 files changed, 50 insertions(+), 30 deletions(-) diff --git a/.gitmodules b/.gitmodules index a4669ba4..a77a2c57 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "skia"] path = skia url = https://github.com/google/skia.git - branch = chrome/m89 + branch = chrome/m116 [submodule "depot_tools"] path = depot_tools url = https://github.com/rust-skia/depot_tools.git diff --git a/__test__/pathkit.spec.ts b/__test__/pathkit.spec.ts index b27de371..75b5b409 100644 --- a/__test__/pathkit.spec.ts +++ b/__test__/pathkit.spec.ts @@ -180,7 +180,7 @@ test('Convert stroke to path 2', (t) => { path.stroke({ width: 10, join: StrokeJoin.Round, miterLimit: 1 }).simplify() const svg = `` - const expected = `` + const expected = `` t.is(svg, expected) }) @@ -213,7 +213,7 @@ test('StrokeJoin.Round', (t) => { t.is( box.toSVGString(), - 'M-10 100L-10 0Q-10 -0.245486 -9.98795 -0.490677Q-9.97591 -0.735867 -9.95185 -0.980171Q-9.92778 -1.22448 -9.89176 -1.4673Q-9.85574 -1.71013 -9.80785 -1.9509Q-9.75996 -2.19167 -9.70031 -2.4298Q-9.64066 -2.66793 -9.5694 -2.90285Q-9.49814 -3.13776 -9.41544 -3.3689Q-9.33274 -3.60003 -9.23879 -3.82683Q-9.14485 -4.05363 -9.03989 -4.27555Q-8.93493 -4.49747 -8.81921 -4.71397Q-8.70349 -4.93047 -8.57729 -5.14103Q-8.45108 -5.35159 -8.31469 -5.5557Q-8.17831 -5.75982 -8.03207 -5.95699Q-7.88584 -6.15417 -7.7301 -6.34393Q-7.57437 -6.5337 -7.40951 -6.71559Q-7.24465 -6.89748 -7.07107 -7.07107Q-6.89748 -7.24465 -6.71559 -7.40951Q-6.5337 -7.57437 -6.34393 -7.7301Q-6.15417 -7.88584 -5.95699 -8.03207Q-5.75982 -8.17831 -5.5557 -8.3147Q-5.35159 -8.45108 -5.14103 -8.57729Q-4.93047 -8.70349 -4.71397 -8.81921Q-4.49747 -8.93493 -4.27555 -9.03989Q-4.05363 -9.14485 -3.82683 -9.23879Q-3.60003 -9.33274 -3.3689 -9.41544Q-3.13776 -9.49814 -2.90285 -9.5694Q-2.66793 -9.64066 -2.4298 -9.70031Q-2.19167 -9.75996 -1.9509 -9.80785Q-1.71013 -9.85574 -1.4673 -9.89176Q-1.22448 -9.92778 -0.980171 -9.95185Q-0.735867 -9.97591 -0.490677 -9.98795Q-0.245486 -10 0 -10L100 -10Q100.245 -10 100.491 -9.98795Q100.736 -9.97591 100.98 -9.95185Q101.224 -9.92778 101.467 -9.89176Q101.71 -9.85574 101.951 -9.80785Q102.192 -9.75996 102.43 -9.70031Q102.668 -9.64066 102.903 -9.5694Q103.138 -9.49814 103.369 -9.41544Q103.6 -9.33274 103.827 -9.23879Q104.054 -9.14485 104.276 -9.03989Q104.497 -8.93493 104.714 -8.81921Q104.93 -8.70349 105.141 -8.57729Q105.352 -8.45108 105.556 -8.31469Q105.76 -8.17831 105.957 -8.03207Q106.154 -7.88584 106.344 -7.7301Q106.534 -7.57437 106.716 -7.40951Q106.897 -7.24465 107.071 -7.07107Q107.245 -6.89748 107.41 -6.71559Q107.574 -6.5337 107.73 -6.34393Q107.886 -6.15417 108.032 -5.95699Q108.178 -5.75982 108.315 -5.5557Q108.451 -5.35159 108.577 -5.14103Q108.703 -4.93047 108.819 -4.71397Q108.935 -4.49747 109.04 -4.27555Q109.145 -4.05363 109.239 -3.82683Q109.333 -3.60003 109.415 -3.3689Q109.498 -3.13776 109.569 -2.90285Q109.641 -2.66793 109.7 -2.4298Q109.76 -2.19167 109.808 -1.9509Q109.856 -1.71013 109.892 -1.4673Q109.928 -1.22448 109.952 -0.980171Q109.976 -0.735867 109.988 -0.490677Q110 -0.245486 110 0L110 100Q110 100.245 109.988 100.491Q109.976 100.736 109.952 100.98Q109.928 101.224 109.892 101.467Q109.856 101.71 109.808 101.951Q109.76 102.192 109.7 102.43Q109.641 102.668 109.569 102.903Q109.498 103.138 109.415 103.369Q109.333 103.6 109.239 103.827Q109.145 104.054 109.04 104.276Q108.935 104.497 108.819 104.714Q108.703 104.93 108.577 105.141Q108.451 105.352 108.315 105.556Q108.178 105.76 108.032 105.957Q107.886 106.154 107.73 106.344Q107.574 106.534 107.41 106.716Q107.245 106.897 107.071 107.071Q106.897 107.245 106.716 107.41Q106.534 107.574 106.344 107.73Q106.154 107.886 105.957 108.032Q105.76 108.178 105.556 108.315Q105.352 108.451 105.141 108.577Q104.93 108.703 104.714 108.819Q104.497 108.935 104.276 109.04Q104.054 109.145 103.827 109.239Q103.6 109.333 103.369 109.415Q103.138 109.498 102.903 109.569Q102.668 109.641 102.43 109.7Q102.192 109.76 101.951 109.808Q101.71 109.856 101.467 109.892Q101.224 109.928 100.98 109.952Q100.736 109.976 100.491 109.988Q100.245 110 100 110L0 110Q-0.245486 110 -0.490677 109.988Q-0.735867 109.976 -0.980171 109.952Q-1.22448 109.928 -1.4673 109.892Q-1.71013 109.856 -1.9509 109.808Q-2.19167 109.76 -2.4298 109.7Q-2.66793 109.641 -2.90285 109.569Q-3.13776 109.498 -3.3689 109.415Q-3.60003 109.333 -3.82683 109.239Q-4.05363 109.145 -4.27555 109.04Q-4.49747 108.935 -4.71397 108.819Q-4.93047 108.703 -5.14103 108.577Q-5.35159 108.451 -5.5557 108.315Q-5.75982 108.178 -5.95699 108.032Q-6.15417 107.886 -6.34393 107.73Q-6.5337 107.574 -6.71559 107.41Q-6.89748 107.245 -7.07107 107.071Q-7.24465 106.897 -7.40951 106.716Q-7.57437 106.534 -7.7301 106.344Q-7.88584 106.154 -8.03207 105.957Q-8.17831 105.76 -8.3147 105.556Q-8.45108 105.352 -8.57729 105.141Q-8.70349 104.93 -8.81921 104.714Q-8.93493 104.497 -9.03989 104.276Q-9.14485 104.054 -9.23879 103.827Q-9.33274 103.6 -9.41544 103.369Q-9.49814 103.138 -9.5694 102.903Q-9.64066 102.668 -9.70031 102.43Q-9.75996 102.192 -9.80785 101.951Q-9.85574 101.71 -9.89176 101.467Q-9.92778 101.224 -9.95185 100.98Q-9.97591 100.736 -9.98795 100.491Q-10 100.245 -10 100ZM10 10L10 90L90 90L90 10L10 10Z', + 'M-10 100L-10 0Q-10 -0.245486 -9.98796 -0.490677Q-9.97591 -0.735867 -9.95185 -0.980171Q-9.92779 -1.22448 -9.89176 -1.4673Q-9.85574 -1.71013 -9.80785 -1.9509Q-9.75996 -2.19167 -9.70031 -2.4298Q-9.64067 -2.66793 -9.5694 -2.90285Q-9.49814 -3.13776 -9.41544 -3.3689Q-9.33274 -3.60003 -9.2388 -3.82683Q-9.14485 -4.05363 -9.03989 -4.27555Q-8.93493 -4.49747 -8.81921 -4.71397Q-8.70349 -4.93047 -8.57729 -5.14103Q-8.45108 -5.35159 -8.3147 -5.5557Q-8.17831 -5.75982 -8.03208 -5.95699Q-7.88584 -6.15417 -7.73011 -6.34393Q-7.57437 -6.5337 -7.40951 -6.71559Q-7.24465 -6.89748 -7.07107 -7.07107Q-6.89748 -7.24465 -6.71559 -7.40951Q-6.5337 -7.57437 -6.34393 -7.7301Q-6.15417 -7.88584 -5.95699 -8.03207Q-5.75982 -8.17831 -5.5557 -8.3147Q-5.35159 -8.45108 -5.14103 -8.57729Q-4.93047 -8.70349 -4.71397 -8.81921Q-4.49747 -8.93493 -4.27555 -9.03989Q-4.05363 -9.14485 -3.82683 -9.23879Q-3.60003 -9.33274 -3.3689 -9.41544Q-3.13776 -9.49814 -2.90285 -9.5694Q-2.66793 -9.64067 -2.4298 -9.70031Q-2.19167 -9.75996 -1.9509 -9.80785Q-1.71013 -9.85574 -1.4673 -9.89176Q-1.22448 -9.92778 -0.980171 -9.95185Q-0.735867 -9.97591 -0.490677 -9.98796Q-0.245486 -10 0 -10L100 -10Q100.245 -10 100.491 -9.98795Q100.736 -9.97591 100.98 -9.95185Q101.224 -9.92779 101.467 -9.89176Q101.71 -9.85574 101.951 -9.80785Q102.192 -9.75996 102.43 -9.70031Q102.668 -9.64067 102.903 -9.5694Q103.138 -9.49814 103.369 -9.41544Q103.6 -9.33274 103.827 -9.2388Q104.054 -9.14485 104.276 -9.03989Q104.497 -8.93493 104.714 -8.81921Q104.93 -8.70349 105.141 -8.57729Q105.352 -8.45108 105.556 -8.3147Q105.76 -8.17831 105.957 -8.03208Q106.154 -7.88584 106.344 -7.73011Q106.534 -7.57437 106.716 -7.40951Q106.897 -7.24465 107.071 -7.07107Q107.245 -6.89748 107.41 -6.71559Q107.574 -6.5337 107.73 -6.34393Q107.886 -6.15417 108.032 -5.95699Q108.178 -5.75982 108.315 -5.5557Q108.451 -5.35159 108.577 -5.14103Q108.703 -4.93047 108.819 -4.71397Q108.935 -4.49747 109.04 -4.27555Q109.145 -4.05363 109.239 -3.82683Q109.333 -3.60003 109.415 -3.3689Q109.498 -3.13776 109.569 -2.90285Q109.641 -2.66793 109.7 -2.4298Q109.76 -2.19167 109.808 -1.9509Q109.856 -1.71013 109.892 -1.4673Q109.928 -1.22448 109.952 -0.980171Q109.976 -0.735867 109.988 -0.490677Q110 -0.245486 110 0L110 100Q110 100.245 109.988 100.491Q109.976 100.736 109.952 100.98Q109.928 101.224 109.892 101.467Q109.856 101.71 109.808 101.951Q109.76 102.192 109.7 102.43Q109.641 102.668 109.569 102.903Q109.498 103.138 109.415 103.369Q109.333 103.6 109.239 103.827Q109.145 104.054 109.04 104.276Q108.935 104.497 108.819 104.714Q108.703 104.93 108.577 105.141Q108.451 105.352 108.315 105.556Q108.178 105.76 108.032 105.957Q107.886 106.154 107.73 106.344Q107.574 106.534 107.41 106.716Q107.245 106.897 107.071 107.071Q106.897 107.245 106.716 107.41Q106.534 107.574 106.344 107.73Q106.154 107.886 105.957 108.032Q105.76 108.178 105.556 108.315Q105.352 108.451 105.141 108.577Q104.93 108.703 104.714 108.819Q104.497 108.935 104.276 109.04Q104.054 109.145 103.827 109.239Q103.6 109.333 103.369 109.415Q103.138 109.498 102.903 109.569Q102.668 109.641 102.43 109.7Q102.192 109.76 101.951 109.808Q101.71 109.856 101.467 109.892Q101.224 109.928 100.98 109.952Q100.736 109.976 100.491 109.988Q100.245 110 100 110L0 110Q-0.245486 110 -0.490677 109.988Q-0.735867 109.976 -0.980171 109.952Q-1.22448 109.928 -1.4673 109.892Q-1.71013 109.856 -1.9509 109.808Q-2.19167 109.76 -2.4298 109.7Q-2.66793 109.641 -2.90285 109.569Q-3.13776 109.498 -3.3689 109.415Q-3.60003 109.333 -3.82683 109.239Q-4.05363 109.145 -4.27555 109.04Q-4.49747 108.935 -4.71397 108.819Q-4.93047 108.703 -5.14103 108.577Q-5.35159 108.451 -5.5557 108.315Q-5.75982 108.178 -5.95699 108.032Q-6.15417 107.886 -6.34393 107.73Q-6.5337 107.574 -6.71559 107.41Q-6.89748 107.245 -7.07107 107.071Q-7.24465 106.897 -7.40951 106.716Q-7.57437 106.534 -7.7301 106.344Q-7.88584 106.154 -8.03207 105.957Q-8.17831 105.76 -8.3147 105.556Q-8.45108 105.352 -8.57729 105.141Q-8.70349 104.93 -8.81921 104.714Q-8.93493 104.497 -9.03989 104.276Q-9.14485 104.054 -9.23879 103.827Q-9.33274 103.6 -9.41544 103.369Q-9.49814 103.138 -9.5694 102.903Q-9.64067 102.668 -9.70031 102.43Q-9.75996 102.192 -9.80785 101.951Q-9.85574 101.71 -9.89176 101.467Q-9.92778 101.224 -9.95185 100.98Q-9.97591 100.736 -9.98796 100.491Q-10 100.245 -10 100ZM10 10L10 90L90 90L90 10L10 10Z', ) }) diff --git a/__test__/svg-canvas.spec.ts.md b/__test__/svg-canvas.spec.ts.md index d65a4988..5b3d5ab7 100644 --- a/__test__/svg-canvas.spec.ts.md +++ b/__test__/svg-canvas.spec.ts.md @@ -12,7 +12,7 @@ Generated by [AVA](https://avajs.dev). ␊ ␊ ␊ - ␊ + ␊ ` ## should be able to export text diff --git a/__test__/svg-canvas.spec.ts.snap b/__test__/svg-canvas.spec.ts.snap index e3addf9ee9d8d4ebb48c3687b29751c4ecff621f..fffa9a03d8797a979df2cb9941daf5f497c279fd 100644 GIT binary patch delta 7760 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 aC!8cU%bkmyUh>d>7G9GQ;%zlSLi!(4ru{|$ diff --git a/index.js b/index.js index 3b8719b5..7ee4ab40 100644 --- a/index.js +++ b/index.js @@ -34,7 +34,7 @@ const Fonts = [] if (!('families' in GlobalFonts)) { Object.defineProperty(GlobalFonts, 'families', { get: function () { - return JSON.parse(GlobalFonts.getFamilies()) + return JSON.parse(GlobalFonts.getFamilies().toString()) }, }) } @@ -42,7 +42,7 @@ if (!('families' in GlobalFonts)) { if (!('has' in GlobalFonts)) { Object.defineProperty(GlobalFonts, 'has', { value: function has(name) { - return !!JSON.parse(GlobalFonts.getFamilies()).find(({ family }) => family === name) + return !!JSON.parse(GlobalFonts.getFamilies().toString()).find(({ family }) => family === name) }, configurable: false, enumerable: false, diff --git a/scripts/build-skia.js b/scripts/build-skia.js index 7c3e5af5..f2899e23 100644 --- a/scripts/build-skia.js +++ b/scripts/build-skia.js @@ -158,11 +158,11 @@ switch (TARGET_TRIPLE) { case 'aarch64-unknown-linux-musl': const gccVersion = execSync('ls /aarch64-linux-musl-cross/aarch64-linux-musl/include/c++').toString('utf8').trim() ExtraSkiaBuildFlag += ' target_cpu="arm64" target_os="linux"' - ExtraCflags = `"--target=aarch64-unknown-linux-musl", "--sysroot=/aarch64-linux-musl-cross/aarch64-linux-musl", "--gcc-toolchain=aarch64-linux-musl-gcc", "-B/aarch64-linux-musl-cross/aarch64-linux-musl/bin", "-I/aarch64-linux-musl-cross/aarch64-linux-musl/include/c++/${gccVersion}", "-I/aarch64-linux-musl-cross/aarch64-linux-musl/include/c++/${gccVersion}/aarch64-linux-musl", "-march=armv8-a"` - ExtraCflagsCC += `, "--target=aarch64-unknown-linux-musl", "--sysroot=/aarch64-linux-musl-cross/aarch64-linux-musl", "--gcc-toolchain=aarch64-linux-musl-gcc", "-B/aarch64-linux-musl-cross/aarch64-linux-musl/bin", "-I/aarch64-linux-musl-cross/aarch64-linux-musl/include/c++/${gccVersion}", "-I/aarch64-linux-musl-cross/aarch64-linux-musl/include/c++/${gccVersion}/aarch64-linux-musl", "-march=armv8-a"` - ExtraLdFlags = `"--target=aarch64-unknown-linux-musl", "--sysroot=/aarch64-linux-musl-cross/usr", "-B/aarch64-linux-musl-cross/usr/aarch64-linux-musl/bin", "-L/aarch64-linux-musl-cross/usr/aarch64-linux-musl/lib", "-L/aarch64-linux-musl-cross/usr/lib/gcc/aarch64-linux-musl/${gccVersion}"` + ExtraCflags = `"--target=aarch64-unknown-linux-musl", "-B/aarch64-linux-musl-cross/aarch64-linux-musl/bin", "-I/aarch64-linux-musl-cross/aarch64-linux-musl/include/c++/${gccVersion}", "-I/aarch64-linux-musl-cross/aarch64-linux-musl/include/c++/${gccVersion}/aarch64-linux-musl", "-march=armv8-a"` + ExtraCflagsCC += `, "--target=aarch64-unknown-linux-musl", "-B/aarch64-linux-musl-cross/aarch64-linux-musl/bin", "-I/aarch64-linux-musl-cross/aarch64-linux-musl/include/c++/${gccVersion}", "-I/aarch64-linux-musl-cross/aarch64-linux-musl/include/c++/${gccVersion}/aarch64-linux-musl", "-march=armv8-a"` + ExtraLdFlags = `"--target=aarch64-unknown-linux-musl", "-B/aarch64-linux-musl-cross/usr/aarch64-linux-musl/bin", "-L/aarch64-linux-musl-cross/usr/aarch64-linux-musl/lib", "-L/aarch64-linux-musl-cross/usr/lib/gcc/aarch64-linux-musl/${gccVersion}"` ExtraAsmFlags = - '"--sysroot=/aarch64-linux-musl-cross/aarch64-linux-musl", "--target=aarch64-unknown-linux-musl", "-march=armv8-a"' + '"--target=aarch64-unknown-linux-musl", "-march=armv8-a"' GN_ARGS.push( `extra_ldflags=[${ExtraLdFlags}]`, `ar="aarch64-linux-musl-ar"`, diff --git a/skia b/skia index d13352a7..7bfc95e8 160000 --- a/skia +++ b/skia @@ -1 +1 @@ -Subproject commit d13352a7937791d666f770ac7026085dc844c006 +Subproject commit 7bfc95e8576e909bd0ecab9c9c6ff9280e2f473c diff --git a/skia-c/skia_c.cpp b/skia-c/skia_c.cpp index 4b394c13..d1c9ea1c 100644 --- a/skia-c/skia_c.cpp +++ b/skia-c/skia_c.cpp @@ -21,7 +21,7 @@ extern "C" { void SkStrSplit(const char* str, const char* delimiters, - SkTArray* out) { + skia_private::TArray* out) { // Skip any delimiters. str += strspn(str, delimiters); if (!*str) { @@ -93,7 +93,7 @@ extern "C" SkGraphics::Init(); auto color_space = COLOR_SPACE_CAST; auto info = SkImageInfo::Make(width, height, kRGBA_8888_SkColorType, alphaType, color_space); - auto surface = SkSurface::MakeRaster(info); + auto surface = SkSurfaces::Raster(info); if (surface) { @@ -140,7 +140,7 @@ extern "C" bool skiac_surface_save(skiac_surface *c_surface, const char *path) { auto image = SURFACE_CAST->makeImageSnapshot(); - auto data = image->encodeToData(SkEncodedImageFormat::kPNG, 0); + auto data = SkPngEncoder::Encode(nullptr, image.release(), SkPngEncoder::Options()); if (data) { SkFILEWStream stream(path); @@ -220,24 +220,36 @@ extern "C" void skiac_surface_png_data(skiac_surface *c_surface, skiac_sk_data *data) { auto image = SURFACE_CAST->makeImageSnapshot(); - auto png_data = image->encodeToData().release(); + auto png_data = SkPngEncoder::Encode(nullptr, image.release(), SkPngEncoder::Options()); if (png_data) { data->ptr = png_data->bytes(); data->size = png_data->size(); - data->data = reinterpret_cast(png_data); + data->data = reinterpret_cast(png_data.release()); } } void skiac_surface_encode_data(skiac_surface *c_surface, skiac_sk_data *data, int format, int quality) { auto image = SURFACE_CAST->makeImageSnapshot(); - auto encoded_data = image->encodeToData((SkEncodedImageFormat)format, quality).release(); + sk_sp encoded_data; + if (format == int(SkEncodedImageFormat::kJPEG)) { + SkJpegEncoder::Options options; + options.fQuality = quality; + encoded_data = SkJpegEncoder::Encode(nullptr, image.release(), options); + } else if (format == int(SkEncodedImageFormat::kPNG)) { + encoded_data = SkPngEncoder::Encode(nullptr, image.release(), SkPngEncoder::Options()); + } else if (format == int(SkEncodedImageFormat::kWEBP)){ + SkWebpEncoder::Options options; + options.fCompression = quality == 100 ? SkWebpEncoder::Compression::kLossless : SkWebpEncoder::Compression::kLossy; + options.fQuality = quality == 100 ? 75 : quality; + encoded_data = SkWebpEncoder::Encode(nullptr, image.release(), options); + } if (encoded_data) { data->ptr = const_cast(encoded_data->bytes()); data->size = encoded_data->size(); - data->data = reinterpret_cast(encoded_data); + data->data = reinterpret_cast(encoded_data.release()); } } @@ -323,7 +335,7 @@ extern "C" { const auto src_rect = SkRect::MakeXYWH(sx, sy, s_width, s_height); const auto dst_rect = SkRect::MakeXYWH(dx, dy, d_width, d_height); - auto sk_image = SkImage::MakeFromBitmap(*BITMAP_CAST); + auto sk_image = SkImages::RasterFromBitmap(*BITMAP_CAST); auto fq = enable_smoothing ? filter_quality : 0; const auto sampling = SamplingOptionsFromFQ(fq); auto paint = reinterpret_cast(c_paint); @@ -403,7 +415,7 @@ extern "C" auto font_collection = c_collection->collection; auto font_style = SkFontStyle(weight, stretch, (SkFontStyle::Slant)slant); auto text_direction = (TextDirection)direction; - SkTArray families; + skia_private::TArray families; SkStrSplit(font_family, ",", &families); TextStyle text_style; std::vector families_vec; @@ -612,7 +624,7 @@ extern "C" auto color_space = COLOR_SPACE_CAST; auto info = SkImageInfo::Make(width, height, SkColorType::kRGBA_8888_SkColorType, SkAlphaType::kUnpremul_SkAlphaType, color_space); auto data = SkData::MakeFromMalloc(pixels, length); - auto image = SkImage::MakeRasterData(info, data, row_bytes); + auto image = SkImages::RasterFromData(info, data, row_bytes); auto src_rect = SkRect::MakeXYWH(dirty_x, dirty_y, dirty_width, dirty_height); auto dst_rect = SkRect::MakeXYWH(x + dirty_x, y + dirty_y, dirty_width, dirty_height); const auto sampling = SkSamplingOptions(SkCubicResampler::Mitchell()); @@ -1396,7 +1408,7 @@ extern "C" skiac_image_filter *skiac_image_filter_from_argb(const uint8_t table_a[256], const uint8_t table_r[256], const uint8_t table_g[256], const uint8_t table_b[256], skiac_image_filter *c_image_filter) { - auto cf = SkTableColorFilter::MakeARGB(table_a, table_r, table_g, table_b); + auto cf = SkColorFilters::TableARGB(table_a, table_r, table_g, table_b); auto chained_filter = sk_sp(IMAGE_FILTER_CAST); if (c_image_filter) { @@ -1547,7 +1559,12 @@ extern "C" return c_font_collection->assets->countFamilies(); } - void skiac_font_collection_get_family(skiac_font_collection *c_font_collection, uint32_t i, skiac_string *c_string, void *on_get_style_rust, skiac_on_match_font_style on_match_font_style) + void skiac_font_collection_get_family( + skiac_font_collection *c_font_collection, + uint32_t i, + skiac_string *c_string, + void *on_get_style_rust, + skiac_on_match_font_style on_match_font_style) { auto name = new SkString(); c_font_collection->assets->getFamilyName(i, name); @@ -1562,7 +1579,6 @@ extern "C" on_match_font_style(style.width(), style.weight(), (int)style.slant(), on_get_style_rust); } } - font_style_set->unref(); c_string->length = name->size(); c_string->ptr = name->c_str(); c_string->sk_string = name; diff --git a/skia-c/skia_c.hpp b/skia-c/skia_c.hpp index e04fb144..68998188 100644 --- a/skia-c/skia_c.hpp +++ b/skia-c/skia_c.hpp @@ -28,10 +28,12 @@ #include #include #include -#include #include #include #include +#include +#include +#include #include #include #include @@ -111,7 +113,7 @@ class TypefaceFontProviderCustom : public TypefaceFontProvider { return nullptr; } - return sk_sp(const_cast(tf)); + return sk_sp(tf); } private: diff --git a/src/global_fonts.rs b/src/global_fonts.rs index 0f4b0abf..51262ada 100644 --- a/src/global_fonts.rs +++ b/src/global_fonts.rs @@ -52,9 +52,9 @@ pub mod GlobalFonts { } #[napi] - pub fn get_families() -> Result { + pub fn get_families() -> Result { let font = get_font().map_err(into_napi_error)?; - Ok(serde_json::to_string(&font.get_families())?) + Ok(serde_json::to_vec(&font.get_families())?.into()) } #[napi] diff --git a/src/sk.rs b/src/sk.rs index 9646b4fd..a6cc2480 100644 --- a/src/sk.rs +++ b/src/sk.rs @@ -3517,7 +3517,7 @@ impl FontCollection { unsafe { let size = ffi::skiac_font_collection_get_default_fonts_count(self.0); for i in 0..size { - let mut styles = Vec::new(); + let mut styles = Vec::with_capacity(4); let on_get_style: Box = Box::new(|width: i32, weight: i32, slant: i32| { styles.push(( @@ -3536,14 +3536,16 @@ impl FontCollection { length: 0, sk_string: ptr::null_mut(), }; + let on_get_style_ptr: *mut dyn FnMut(i32, i32, i32) = Box::into_raw(Box::new(on_get_style)); ffi::skiac_font_collection_get_family( self.0, i, &mut name, - Box::into_raw(Box::new(on_get_style)) as *mut c_void, + on_get_style_ptr.cast(), Some(skiac_on_get_style), ); let c_str: &CStr = CStr::from_ptr(name.ptr); + drop(Box::from_raw(on_get_style_ptr)); names.push(FontStyleSet { family: c_str.to_string_lossy().into_owned(), styles: styles