Skip to content

Commit 9155f77

Browse files
committed
v3.3.9 - Fixes issue #47 - Metafile parsing hack still may err but it is only tried when lines have custom line caps now, what may not be that common
1 parent 70181ba commit 9155f77

File tree

8 files changed

+171
-204
lines changed

8 files changed

+171
-204
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ A fork of the SvgNet & SvgGdi bridge (http://www.codeproject.com/KB/cs/svgnet.as
44

55
__SvgNet is now available as a Nuget:__ [SvgNet](https://www.nuget.org/packages/SvgNet/).
66

7-
__Latest version 3.3.8 is .NET Standard 2.0 and 2.1 and also .NET 6.0/8.0 (base and Windows) compatible and works with .NET Core 2.x and 3.x and .NET 5.0/6.0/7.0/8.0, but now requires .NET Framework 4.6.2 or higher__
7+
__Latest version 3.3.9 is .NET Standard 2.0 and 2.1 and also .NET 6.0/8.0 (base and Windows) compatible and works with .NET Core 2.x and 3.x and .NET 5.0/6.0/7.0/8.0, but now requires .NET Framework 4.6.2 or higher__
88

9-
To build this version properly you need .NET 8.0.303+ SDK installed
9+
To build this version properly you need .NET 8.0.403+ SDK installed
1010

1111
## License: BSD
1212

SvgDocTest/SvgDocTest.csproj.user

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,48 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ReferencePath />
7-
<CopyProjectDestinationFolder />
8-
<CopyProjectUncPath />
9-
<CopyProjectOption>0</CopyProjectOption>
10-
<ProjectView>ProjectFiles</ProjectView>
11-
<ProjectTrust>0</ProjectTrust>
12-
</PropertyGroup>
13-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14-
<EnableASPDebugging>false</EnableASPDebugging>
15-
<EnableASPXDebugging>false</EnableASPXDebugging>
16-
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
17-
<EnableSQLServerDebugging>false</EnableSQLServerDebugging>
18-
<RemoteDebugEnabled>false</RemoteDebugEnabled>
19-
<RemoteDebugMachine />
20-
<StartAction>Project</StartAction>
21-
<StartArguments />
22-
<StartPage />
23-
<StartProgram />
24-
<StartURL />
25-
<StartWorkingDirectory />
26-
<StartWithIE>true</StartWithIE>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<EnableASPDebugging>false</EnableASPDebugging>
30-
<EnableASPXDebugging>false</EnableASPXDebugging>
31-
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
32-
<EnableSQLServerDebugging>false</EnableSQLServerDebugging>
33-
<RemoteDebugEnabled>false</RemoteDebugEnabled>
34-
<RemoteDebugMachine />
35-
<StartAction>Project</StartAction>
36-
<StartArguments />
37-
<StartPage />
38-
<StartProgram />
39-
<StartURL />
40-
<StartWorkingDirectory />
41-
<StartWithIE>true</StartWithIE>
42-
</PropertyGroup>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ReferencePath />
7+
<CopyProjectDestinationFolder />
8+
<CopyProjectUncPath />
9+
<CopyProjectOption>0</CopyProjectOption>
10+
<ProjectView>ProjectFiles</ProjectView>
11+
<ProjectTrust>0</ProjectTrust>
12+
</PropertyGroup>
13+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14+
<EnableASPDebugging>false</EnableASPDebugging>
15+
<EnableASPXDebugging>false</EnableASPXDebugging>
16+
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
17+
<EnableSQLServerDebugging>false</EnableSQLServerDebugging>
18+
<RemoteDebugEnabled>false</RemoteDebugEnabled>
19+
<RemoteDebugMachine />
20+
<StartAction>Project</StartAction>
21+
<StartArguments />
22+
<StartPage />
23+
<StartProgram />
24+
<StartURL />
25+
<StartWorkingDirectory />
26+
<StartWithIE>true</StartWithIE>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<EnableASPDebugging>false</EnableASPDebugging>
30+
<EnableASPXDebugging>false</EnableASPXDebugging>
31+
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
32+
<EnableSQLServerDebugging>false</EnableSQLServerDebugging>
33+
<RemoteDebugEnabled>false</RemoteDebugEnabled>
34+
<RemoteDebugMachine />
35+
<StartAction>Project</StartAction>
36+
<StartArguments />
37+
<StartPage />
38+
<StartProgram />
39+
<StartURL />
40+
<StartWorkingDirectory />
41+
<StartWithIE>true</StartWithIE>
42+
</PropertyGroup>
43+
<ItemGroup>
44+
<Compile Update="DocForm.cs">
45+
<SubType>Form</SubType>
46+
</Compile>
47+
</ItemGroup>
4348
</Project>

SvgGdiTest/SvgGdiTest.csproj.user

Lines changed: 47 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,48 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ReferencePath />
7-
<CopyProjectDestinationFolder />
8-
<CopyProjectUncPath />
9-
<CopyProjectOption>0</CopyProjectOption>
10-
<ProjectView>ProjectFiles</ProjectView>
11-
<ProjectTrust>0</ProjectTrust>
12-
</PropertyGroup>
13-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14-
<EnableASPDebugging>false</EnableASPDebugging>
15-
<EnableASPXDebugging>false</EnableASPXDebugging>
16-
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
17-
<EnableSQLServerDebugging>false</EnableSQLServerDebugging>
18-
<RemoteDebugEnabled>false</RemoteDebugEnabled>
19-
<RemoteDebugMachine />
20-
<StartAction>Project</StartAction>
21-
<StartArguments />
22-
<StartPage />
23-
<StartProgram />
24-
<StartURL />
25-
<StartWorkingDirectory />
26-
<StartWithIE>true</StartWithIE>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<EnableASPDebugging>false</EnableASPDebugging>
30-
<EnableASPXDebugging>false</EnableASPXDebugging>
31-
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
32-
<EnableSQLServerDebugging>false</EnableSQLServerDebugging>
33-
<RemoteDebugEnabled>false</RemoteDebugEnabled>
34-
<RemoteDebugMachine />
35-
<StartAction>Project</StartAction>
36-
<StartArguments />
37-
<StartPage />
38-
<StartProgram />
39-
<StartURL />
40-
<StartWorkingDirectory />
41-
<StartWithIE>true</StartWithIE>
42-
</PropertyGroup>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6+
<ReferencePath />
7+
<CopyProjectDestinationFolder />
8+
<CopyProjectUncPath />
9+
<CopyProjectOption>0</CopyProjectOption>
10+
<ProjectView>ProjectFiles</ProjectView>
11+
<ProjectTrust>0</ProjectTrust>
12+
</PropertyGroup>
13+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
14+
<EnableASPDebugging>false</EnableASPDebugging>
15+
<EnableASPXDebugging>false</EnableASPXDebugging>
16+
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
17+
<EnableSQLServerDebugging>false</EnableSQLServerDebugging>
18+
<RemoteDebugEnabled>false</RemoteDebugEnabled>
19+
<RemoteDebugMachine />
20+
<StartAction>Project</StartAction>
21+
<StartArguments />
22+
<StartPage />
23+
<StartProgram />
24+
<StartURL />
25+
<StartWorkingDirectory />
26+
<StartWithIE>true</StartWithIE>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<EnableASPDebugging>false</EnableASPDebugging>
30+
<EnableASPXDebugging>false</EnableASPXDebugging>
31+
<EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
32+
<EnableSQLServerDebugging>false</EnableSQLServerDebugging>
33+
<RemoteDebugEnabled>false</RemoteDebugEnabled>
34+
<RemoteDebugMachine />
35+
<StartAction>Project</StartAction>
36+
<StartArguments />
37+
<StartPage />
38+
<StartProgram />
39+
<StartURL />
40+
<StartWorkingDirectory />
41+
<StartWithIE>true</StartWithIE>
42+
</PropertyGroup>
43+
<ItemGroup>
44+
<Compile Update="SvgGdiTestForm.cs">
45+
<SubType>Form</SubType>
46+
</Compile>
47+
</ItemGroup>
4348
</Project>

SvgGdiTest/SvgGdiTestForm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@ private void SvgGdiTestForm_Load(object sender, EventArgs e) {
8282
TestShared.Renderers.Add("Images", RenderImages);
8383
TestShared.Renderers.Add("Text Rect Aligned", ig => RectAlignedTextTest.RenderRectAlignedText(ig, panel1.ClientSize.Width, panel1.ClientSize.Height, Font));
8484
cbWhat.Items.Clear();
85-
cbWhat.Items.AddRange(TestShared.Renderers.Keys.OrderBy(s => s).ToArray());
85+
cbWhat.Items.AddRange([.. TestShared.Renderers.Keys.OrderBy(s => s)]);
8686
}
8787
}

SvgGdiTest/testdoc.xml

Lines changed: 35 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)