Skip to content

Swap Skia SVG NuGet Package #3

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

Merged
mstancombe merged 1 commit into from
Dec 19, 2023
Merged

Swap Skia SVG NuGet Package #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions Source/HtmlRenderer.SkiaSharp/Adapters/ImageAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@

using SkiaSharp;
using TheArtOfDev.HtmlRenderer.Adapters;
using SKSvg = SkiaSharp.Extended.Svg.SKSvg;

using Svg.Skia;

namespace TheArtOfDev.HtmlRenderer.SkiaSharp.Adapters
{
Expand All @@ -25,8 +24,7 @@ internal sealed class ImageAdapter : RImage
/// <summary>
/// the underlying image. This may be either a bitmap (_image) or an svg (_svg).
/// </summary>
private SKImage _image;

private SKImage? _image;
private readonly SKSvg? _svg;

/// <summary>
Expand All @@ -42,36 +40,31 @@ public ImageAdapter(SKSvg svg)
_svg = svg;
}


/// <summary>
/// the underline SkiaSharp image.
/// </summary>
public SKImage Image
{
get
{
if (_image == null && _svg != null)
{
if (_image == null && _svg?.Picture != null)
{
//Render the image from the picture, as this is being used in a texture brush.
_image = SKImage.FromBitmap(new SKBitmap((int)_svg.CanvasSize.Width, (int)_svg.CanvasSize.Height));
_image = SKImage.FromPicture(_svg.Picture, _svg.Picture.CullRect.Size.ToSizeI());
}

return _image;
}
}

/// <summary>
/// Picture if this represents a structured image, eg, SVG.
/// </summary>
public SKPicture Picture { get; set; }

public override double Width
{
get { return _image?.Width ?? ((int?)_svg?.CanvasSize.Width) ?? 0; }
get { return _image?.Width ?? _svg?.Picture?.CullRect.Width ?? 0; }
}

public override double Height
{
get { return _image?.Height ?? ((int?)_svg?.CanvasSize.Height) ?? 0; }
get { return _image?.Height ?? _svg?.Picture?.CullRect.Height ?? 0; }
}

public override void Dispose()
Expand All @@ -82,7 +75,6 @@ public override void Dispose()

internal void DrawImage(SKCanvas canvas, SKRect dstRect, SKRect? srcRect = null)
{

if (_svg != null)
{
//TODO: support the overload that passes a source rect. Using Matrix overload perhaps?..
Expand Down
2 changes: 1 addition & 1 deletion Source/HtmlRenderer.SkiaSharp/Adapters/SkiaSharpAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ protected override RImage ImageFromStreamInt(Stream memoryStream)
{
//Maybe an SVG? In future, let's make the html renderer pass media type if it's available.
memoryStream.Seek(0, SeekOrigin.Begin);
var skSvg = new global::SkiaSharp.Extended.Svg.SKSvg();
var skSvg = new Svg.Skia.SKSvg();
skSvg.Load(memoryStream);
return new ImageAdapter(skSvg);
}
Expand Down
2 changes: 1 addition & 1 deletion Source/HtmlRenderer.SkiaSharp/HtmlRenderer.SkiaSharp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<ItemGroup>
<PackageReference Include="SkiaSharp" Version="2.88.6" />
<PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
<PackageReference Include="Svg.Skia" Version="1.0.0.9" />
</ItemGroup>

<ItemGroup>
Expand Down