github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-19 21:13:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed SvgContainer support for the .greenshot file

Browse source
This commit is contained in:
Robin Krom 2023-03-27 22:43:03 +02:00
commit f862e79485
4 changed files with 116 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/Greenshot.Editor/Drawing/SvgContainer.cs
View file

@ -21,6 +21,7 @@
using System; using System;
using System.Drawing; using System.Drawing;
using System.IO;
using Dapplo.Windows.Common.Structs; using Dapplo.Windows.Common.Structs;
using Greenshot.Base.Core; using Greenshot.Base.Core;
using Greenshot.Base.Interfaces; using Greenshot.Base.Interfaces;
@ -34,12 +35,30 @@ namespace Greenshot.Editor.Drawing
[Serializable] [Serializable]
public class SvgContainer : VectorGraphicsContainer public class SvgContainer : VectorGraphicsContainer
{ {
private readonly SvgDocument _svgDocument; private MemoryStream _svgContent;
public SvgContainer(SvgDocument svgDocument, ISurface parent) : base(parent) [NonSerialized]
private SvgDocument _svgDocument;
public SvgContainer(Stream stream, ISurface parent) : base(parent)
{ {
_svgDocument = svgDocument; _svgContent = new MemoryStream();
Size = new Size((int)svgDocument.Width, (int)svgDocument.Height); stream.CopyTo(_svgContent);
Init();
Size = new Size((int)_svgDocument.Width, (int)_svgDocument.Height);
}
protected override void Init()
{
base.Init();
// Do nothing when there is no content
if (_svgContent == null)
{
return;
}
_svgContent.Position = 0;
_svgDocument = SvgDocument.Open<SvgDocument>(_svgContent);
} }
protected override Image ComputeBitmap() protected override Image ComputeBitmap()

3
src/Greenshot.Editor/Drawing/VectorGraphicsContainer.cs
View file

@ -47,7 +47,8 @@ namespace Greenshot.Editor.Drawing
/// This is the cached version of the bitmap, pre-rendered to save performance /// This is the cached version of the bitmap, pre-rendered to save performance
/// Do not serialized, it can be rebuild with other information. /// Do not serialized, it can be rebuild with other information.
/// </summary> /// </summary>
[NonSerialized] private Image _cachedImage; [NonSerialized]
private Image _cachedImage;
/// <summary> /// <summary>
/// Constructor takes care of calling Init /// Constructor takes care of calling Init

8
src/Greenshot.Editor/FileFormatHandlers/SvgFileFormatHandler.cs
View file

@ -71,18 +71,18 @@ namespace Greenshot.Editor.FileFormatHandlers
public override IEnumerable<IDrawableContainer> LoadDrawablesFromStream(Stream stream, string extension, ISurface parent = null) public override IEnumerable<IDrawableContainer> LoadDrawablesFromStream(Stream stream, string extension, ISurface parent = null)
{ {
SvgDocument svgDocument = null; SvgContainer svgContainer = null;
try try
{ {
svgDocument = SvgDocument.Open<SvgDocument>(stream); svgContainer = new SvgContainer(stream, parent);
} }
catch (Exception ex) catch (Exception ex)
{ {
Log.Error("Can't load SVG", ex); Log.Error("Can't load SVG", ex);
} }
if (svgDocument != null) if (svgContainer != null)
{ {
yield return new SvgContainer(svgDocument, parent); yield return svgContainer;
} }
} }
} }

1
src/Greenshot.Editor/Helpers/BinaryFormatterHelper.cs
View file

@ -48,6 +48,7 @@ namespace Greenshot.Editor.Helpers
{"System.Drawing.Bitmap",typeof(System.Drawing.Bitmap) }, {"System.Drawing.Bitmap",typeof(System.Drawing.Bitmap) },
{"System.Drawing.Icon",typeof(System.Drawing.Icon) }, {"System.Drawing.Icon",typeof(System.Drawing.Icon) },
{"System.Drawing.Size",typeof(System.Drawing.Size) }, {"System.Drawing.Size",typeof(System.Drawing.Size) },
{"System.IO.MemoryStream",typeof(System.IO.MemoryStream) },
{"System.Drawing.StringAlignment",typeof(System.Drawing.StringAlignment) }, {"System.Drawing.StringAlignment",typeof(System.Drawing.StringAlignment) },
{"System.Collections.Generic.List`1[[Greenshot.Base.Interfaces.Drawing.IFieldHolder", typeof(List<IFieldHolder>)}, {"System.Collections.Generic.List`1[[Greenshot.Base.Interfaces.Drawing.IFieldHolder", typeof(List<IFieldHolder>)},
{"System.Collections.Generic.List`1[[Greenshot.Base.Interfaces.Drawing.IField", typeof(List<IField>)}, {"System.Collections.Generic.List`1[[Greenshot.Base.Interfaces.Drawing.IField", typeof(List<IField>)},