Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ImportedProjects
SVG
Commits
69532c40
Commit
69532c40
authored
Jul 30, 2014
by
Eric Domke
Browse files
Attempting to fix merge conflicts
parents
7a093b52
ba8a9744
Changes
10
Show whitespace changes
Inline
Side-by-side
Source/Document Structure/SvgDescription.cs
View file @
69532c40
...
@@ -23,6 +23,7 @@ namespace Svg
...
@@ -23,6 +23,7 @@ namespace Svg
public
override
SvgElement
DeepCopy
<
T
>()
public
override
SvgElement
DeepCopy
<
T
>()
{
{
var
newObj
=
base
.
DeepCopy
<
T
>()
as
SvgDescription
;
var
newObj
=
base
.
DeepCopy
<
T
>()
as
SvgDescription
;
newObj
.
Text
=
this
.
Text
;
return
newObj
;
return
newObj
;
}
}
...
...
Source/Document Structure/SvgTitle.cs
View file @
69532c40
Source/Painting/SvgColourConverter.cs
View file @
69532c40
Source/Painting/SvgPaintServerFactory.cs
View file @
69532c40
Source/Paths/SvgClosePathSegment.cs
View file @
69532c40
Source/Paths/SvgPathBuilder.cs
View file @
69532c40
...
@@ -222,9 +222,9 @@ namespace Svg
...
@@ -222,9 +222,9 @@ namespace Svg
{
{
var
lastSegment
=
segments
.
Last
;
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
)
if
(
lastSegment
is
SvgClosePathSegment
)
lastSegment
=
segments
.
OfType
<
SvgMoveToSegment
>().
Last
()
;
lastSegment
=
segments
[
segments
.
Count
-
2
]
;
if
(
isRelativeX
)
if
(
isRelativeX
)
{
{
...
@@ -290,7 +290,6 @@ namespace Svg
...
@@ -290,7 +290,6 @@ namespace Svg
{
{
if
(
value
is
string
)
if
(
value
is
string
)
{
{
if
(
string
.
IsNullOrEmpty
((
string
)
value
))
return
new
SvgPathSegmentList
();
return
Parse
((
string
)
value
);
return
Parse
((
string
)
value
);
}
}
...
...
Source/Svg.csproj
View file @
69532c40
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
<OldToolsVersion>
3.5
</OldToolsVersion>
<OldToolsVersion>
3.5
</OldToolsVersion>
<UpgradeBackupLocation>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>
v
3.5
</TargetFrameworkVersion>
<TargetFrameworkVersion>
v
4.0
</TargetFrameworkVersion>
<IsWebBootstrapper>
false
</IsWebBootstrapper>
<IsWebBootstrapper>
false
</IsWebBootstrapper>
<SccProjectName>
<SccProjectName>
</SccProjectName>
</SccProjectName>
...
@@ -121,6 +121,7 @@
...
@@ -121,6 +121,7 @@
<Compile
Include=
"Extensions.cs"
/>
<Compile
Include=
"Extensions.cs"
/>
<Compile
Include=
"Painting\ISvgBoundable.cs"
/>
<Compile
Include=
"Painting\ISvgBoundable.cs"
/>
<Compile
Include=
"Painting\SvgDeferredPaintServer.cs"
/>
<Compile
Include=
"Painting\SvgDeferredPaintServer.cs"
/>
<Compile
Include=
"Painting\ISvgBoundable.cs"
/>
<Compile
Include=
"Painting\SvgMarker.cs"
/>
<Compile
Include=
"Painting\SvgMarker.cs"
/>
<Compile
Include=
"Document Structure\SvgDefinitionList.cs"
/>
<Compile
Include=
"Document Structure\SvgDefinitionList.cs"
/>
<Compile
Include=
"Document Structure\SvgDescription.cs"
/>
<Compile
Include=
"Document Structure\SvgDescription.cs"
/>
...
...
Source/SvgDocument.cs
View file @
69532c40
Source/SvgElement.cs
View file @
69532c40
Source/Text/SvgText.cs
View file @
69532c40
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment