Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More Span<T> and ReadOnlySpan<T> #2669

Open
wants to merge 16 commits into
base: dev/reduce-arrays
Choose a base branch
from
Open

More Span<T> and ReadOnlySpan<T> #2669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
953c570
fix: Restore nosimd builds for edge enhanced security and safari (#2612)
jeromelaban Sep 18, 2023
11ad364
Update webp to 1.3.2 (#2622)
mattleibow Sep 19, 2023
06c4abb
Update README.md (#2625)
mattleibow Sep 21, 2023
25e70a3
Update README.md (#2627)
mattleibow Sep 22, 2023
4dfdad4
Merge branch 'dev/reduce-arrays' of https://github.com/mono/SkiaSharp
ScrubN Nov 4, 2023
3767655
Convert many arrays to spans, or add span overloads where array overl…
ScrubN Nov 10, 2023
4abd792
Remove some unnecessary null checks.
ScrubN Nov 10, 2023
b6a95d2
Convert non-obsolete DrawText & DrawTextOnPath overloads to use ReadO…
ScrubN Nov 10, 2023
7b3e666
Swap out `new T[0]` for `Array.Empty<T> ()`
ScrubN Nov 10, 2023
a846dce
Fix apparent memory leak when drawing vertices
ScrubN Nov 10, 2023
74a4d0b
Minor memory improvements
ScrubN Nov 10, 2023
dd83aec
Fix typo
ScrubN Nov 13, 2023
b006c08
Add ReadOnlySpan<char> overloads to SKShaper.Shape and convert DrawSh…
ScrubN Nov 14, 2023
c6cf62d
Add tests for SKShaper.Shape with ReadOnlySpan<char>
ScrubN Nov 14, 2023
98cf75c
Adjust some methods
ScrubN Nov 14, 2023
ec93cb3
Add some span-array overload comparison tests
ScrubN Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 18 additions & 18 deletions source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/CanvasExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,60 +4,60 @@ namespace SkiaSharp.HarfBuzz
{
public static class CanvasExtensions
{
[Obsolete("Use DrawShapedText(string text, SKPoint p, SKTextAlign textAlign, SKFont font, SKPaint paint) instead.")]
[Obsolete("Use DrawShapedText(ReadOnlySpan<char> text, SKPoint p, SKTextAlign textAlign, SKFont font, SKPaint paint) instead.")]
public static void DrawShapedText(this SKCanvas canvas, string text, SKPoint p, SKPaint paint) =>
canvas.DrawShapedText(text, p.X, p.Y, paint.TextAlign, paint.GetFont(), paint);
canvas.DrawShapedText(text.AsSpan(), p.X, p.Y, paint.TextAlign, paint.GetFont(), paint);

public static void DrawShapedText(this SKCanvas canvas, string text, SKPoint p, SKFont font, SKPaint paint) =>
public static void DrawShapedText(this SKCanvas canvas, ReadOnlySpan<char> text, SKPoint p, SKFont font, SKPaint paint) =>
#pragma warning disable CS0618 // Type or member is obsolete (TODO: replace paint.TextAlign with SKTextAlign.Left)
canvas.DrawShapedText(text, p.X, p.Y, paint.TextAlign, font, paint);
#pragma warning restore CS0618 // Type or member is obsolete

public static void DrawShapedText(this SKCanvas canvas, string text, SKPoint p, SKTextAlign textAlign, SKFont font, SKPaint paint) =>
public static void DrawShapedText(this SKCanvas canvas, ReadOnlySpan<char> text, SKPoint p, SKTextAlign textAlign, SKFont font, SKPaint paint) =>
canvas.DrawShapedText(text, p.X, p.Y, textAlign, font, paint);

[Obsolete("Use DrawShapedText(string text, float x, float y, SKTextAlign textAlign, SKFont font, SKPaint paint) instead.")]
[Obsolete("Use DrawShapedText(ReadOnlySpan<char> text, float x, float y, SKTextAlign textAlign, SKFont font, SKPaint paint) instead.")]
public static void DrawShapedText(this SKCanvas canvas, string text, float x, float y, SKPaint paint) =>
canvas.DrawShapedText(text, x, y, paint.TextAlign, paint.GetFont(), paint);
canvas.DrawShapedText(text.AsSpan(), x, y, paint.TextAlign, paint.GetFont(), paint);

public static void DrawShapedText(this SKCanvas canvas, string text, float x, float y, SKFont font, SKPaint paint) =>
public static void DrawShapedText(this SKCanvas canvas, ReadOnlySpan<char> text, float x, float y, SKFont font, SKPaint paint) =>
#pragma warning disable CS0618 // Type or member is obsolete (TODO: replace paint.TextAlign with SKTextAlign.Left)
canvas.DrawShapedText(text, x, y, paint.TextAlign, font, paint);
#pragma warning restore CS0618 // Type or member is obsolete

public static void DrawShapedText(this SKCanvas canvas, string text, float x, float y, SKTextAlign textAlign, SKFont font, SKPaint paint)
public static void DrawShapedText(this SKCanvas canvas, ReadOnlySpan<char> text, float x, float y, SKTextAlign textAlign, SKFont font, SKPaint paint)
{
if (string.IsNullOrEmpty(text))
if (text.IsEmpty)
return;

using var shaper = new SKShaper(font.Typeface);
canvas.DrawShapedText(shaper, text, x, y, textAlign, font, paint);
}

[Obsolete("Use DrawShapedText(SKShaper shaper, string text, SKPoint p, SKTextAlign textAlign, SKFont font, SKPaint paint) instead.")]
[Obsolete("Use DrawShapedText(SKShaper shaper, ReadOnlySpan<char> text, SKPoint p, SKTextAlign textAlign, SKFont font, SKPaint paint) instead.")]
public static void DrawShapedText(this SKCanvas canvas, SKShaper shaper, string text, SKPoint p, SKPaint paint) =>
canvas.DrawShapedText(shaper, text, p.X, p.Y, paint.TextAlign, paint.GetFont(), paint);
canvas.DrawShapedText(shaper, text.AsSpan(), p.X, p.Y, paint.TextAlign, paint.GetFont(), paint);

public static void DrawShapedText(this SKCanvas canvas, SKShaper shaper, string text, SKPoint p, SKFont font, SKPaint paint) =>
public static void DrawShapedText(this SKCanvas canvas, SKShaper shaper, ReadOnlySpan<char> text, SKPoint p, SKFont font, SKPaint paint) =>
#pragma warning disable CS0618 // Type or member is obsolete (TODO: replace paint.TextAlign with SKTextAlign.Left)
canvas.DrawShapedText(shaper, text, p.X, p.Y, paint.TextAlign, font, paint);
#pragma warning restore CS0618 // Type or member is obsolete

public static void DrawShapedText(this SKCanvas canvas, SKShaper shaper, string text, SKPoint p, SKTextAlign textAlign, SKFont font, SKPaint paint) =>
public static void DrawShapedText(this SKCanvas canvas, SKShaper shaper, ReadOnlySpan<char> text, SKPoint p, SKTextAlign textAlign, SKFont font, SKPaint paint) =>
canvas.DrawShapedText(shaper, text, p.X, p.Y, textAlign, font, paint);

[Obsolete("Use DrawShapedText(SKShaper shaper, string text, float x, float y, SKTextAlign textAlign, SKFont font, SKPaint paint) instead.")]
[Obsolete("Use DrawShapedText(SKShaper shaper, ReadOnlySpan<char> text, float x, float y, SKTextAlign textAlign, SKFont font, SKPaint paint) instead.")]
public static void DrawShapedText(this SKCanvas canvas, SKShaper shaper, string text, float x, float y, SKPaint paint) =>
canvas.DrawShapedText(shaper, text, x, y, paint.TextAlign, paint.GetFont(), paint);
canvas.DrawShapedText(shaper, text.AsSpan(), x, y, paint.TextAlign, paint.GetFont(), paint);

public static void DrawShapedText(this SKCanvas canvas, SKShaper shaper, string text, float x, float y, SKFont font, SKPaint paint) =>
public static void DrawShapedText(this SKCanvas canvas, SKShaper shaper, ReadOnlySpan<char> text, float x, float y, SKFont font, SKPaint paint) =>
#pragma warning disable CS0618 // Type or member is obsolete (TODO: replace paint.TextAlign with SKTextAlign.Left)
canvas.DrawShapedText(shaper, text, x, y, paint.TextAlign, font, paint);
#pragma warning restore CS0618 // Type or member is obsolete

public static void DrawShapedText(this SKCanvas canvas, SKShaper shaper, string text, float x, float y, SKTextAlign textAlign, SKFont font, SKPaint paint)
public static void DrawShapedText(this SKCanvas canvas, SKShaper shaper, ReadOnlySpan<char> text, float x, float y, SKTextAlign textAlign, SKFont font, SKPaint paint)
{
if (string.IsNullOrEmpty(text))
if (text.IsEmpty)
return;

if (canvas == null)
Expand Down
18 changes: 18 additions & 0 deletions source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SKShaper.cs
View file
Open in desktop
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a specific reason public Result Shape(string text, float xOffset, float yOffset, SKFont font) uses buffer.AddUtf8 instead of buffer.AddUtf16?

Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,24 @@ public Result Shape(string text, float xOffset, float yOffset, SKFont font)
return Shape(buffer, xOffset, yOffset, font);
}

public Result Shape(ReadOnlySpan<char> text, SKFont font) =>
Shape(text, 0, 0, font);

public Result Shape(ReadOnlySpan<char> text, float xOffset, float yOffset, SKFont font)
{
if (text.IsEmpty)
{
return new Result();
}

using var buffer = new Buffer();
buffer.AddUtf16(text);

buffer.GuessSegmentProperties();

return Shape(buffer, xOffset, yOffset, font);
}

public class Result
{
public Result()
Expand Down