Commit 69532c40 authored by Eric Domke's avatar Eric Domke
Browse files

Attempting to fix merge conflicts

parents 7a093b52 ba8a9744
......@@ -23,6 +23,7 @@ namespace Svg
public override SvgElement DeepCopy<T>()
{
var newObj = base.DeepCopy<T>() as SvgDescription;
newObj.Text = this.Text;
return newObj;
}
......
......@@ -222,9 +222,9 @@ namespace Svg
{
var lastSegment = segments.Last;
// if the last element is a SvgClosePathSegment the position of the previous move to should be used because the position of SvgClosePathSegment is 0,0
// if the last element is a SvgClosePathSegment the position of the previous element should be used because the position of SvgClosePathSegment is 0,0
if (lastSegment is SvgClosePathSegment)
lastSegment = segments.OfType<SvgMoveToSegment>().Last();
lastSegment = segments[segments.Count - 2];
if (isRelativeX)
{
......@@ -290,7 +290,6 @@ namespace Svg
{
if (value is string)
{
if (string.IsNullOrEmpty((string)value)) return new SvgPathSegmentList();
return Parse((string)value);
}
......
......@@ -16,7 +16,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<SccProjectName>
</SccProjectName>
......@@ -121,6 +121,7 @@
<Compile Include="Extensions.cs" />
<Compile Include="Painting\ISvgBoundable.cs" />
<Compile Include="Painting\SvgDeferredPaintServer.cs" />
<Compile Include="Painting\ISvgBoundable.cs" />
<Compile Include="Painting\SvgMarker.cs" />
<Compile Include="Document Structure\SvgDefinitionList.cs" />
<Compile Include="Document Structure\SvgDescription.cs" />
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment