Skip to content
This repository was archived by the owner on Jan 18, 2020. It is now read-only.

Commit bca6cb1

Browse files
JimBobSquarePantsJimBobSquarePants
authored
Merge pull request #59 from SixLabors/beta8
Update dependencies + remove struct copy
2 parents 5dee898 + 0cc805e commit bca6cb1

File tree

11 files changed

+105
-113
lines changed

11 files changed

+105
-113
lines changed

‎.editorconfig

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "standards"]
2+
path = standards
3+
url = https://github.com/SixLabors/Standards

‎SixLabors.Shapes.ruleset

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎SixLabors.Shapes.sln

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ VisualStudioVersion = 15.0.26430.6
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
77
ProjectSection(SolutionItems) = preProject
8-
.editorconfig = .editorconfig
8+
standards\.editorconfig = standards\.editorconfig
99
appveyor.yml = appveyor.yml
1010
build.cmd = build.cmd
1111
NuGet.config = NuGet.config
1212
README.md = README.md
13+
standards\SixLabors.ruleset = standards\SixLabors.ruleset
14+
standards\stylecop.json = standards\stylecop.json
1315
EndProjectSection
1416
EndProject
1517
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{815C0625-CD3D-440F-9F80-2D83856AB7AE}"

‎appveyor.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ image: Visual Studio 2017
44
install:
55

66
before_build:
7+
- git submodule -q update --init
78
- cmd: dotnet --version
89

910
build_script:

‎src/SixLabors.Shapes.Text/BaseGlyphBuilder.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ void IGlyphRenderer.EndText()
4444
}
4545

4646
/// <inheritdoc/>
47-
void IGlyphRenderer.BeginText(RectangleF rect)
47+
void IGlyphRenderer.BeginText(RectangleF bounds)
4848
{
49-
this.BeginText(rect);
49+
this.BeginText(bounds);
5050
}
5151

5252
/// <inheritdoc/>
53-
bool IGlyphRenderer.BeginGlyph(RectangleF rect, GlyphRendererParameters glyphDetails)
53+
bool IGlyphRenderer.BeginGlyph(RectangleF bounds, GlyphRendererParameters paramaters)
5454
{
5555
this.builder.Clear();
56-
this.BeginGlyph(rect);
56+
this.BeginGlyph(bounds);
5757
return true;
5858
}
5959

‎src/SixLabors.Shapes.Text/SixLabors.Shapes.Text.csproj

Lines changed: 47 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,51 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<Authors>Six Labors and contributors</Authors>
4-
<Company>Six Labors</Company>
5-
<Copyright>Copyright (c) Six Labors and contributors.</Copyright>
6-
<Description>Allows generating glyphs for text and a font for manipulation using SixLabors.Shapes</Description>
7-
<NeutralLanguage>en</NeutralLanguage>
8-
<AssemblyTitle>SixLabors.Shapes.Text</AssemblyTitle>
9-
<VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
10-
<VersionPrefix Condition="$(packageversion) == ''">0.1.0-alpha1</VersionPrefix>
11-
<Authors>Six Labors and contributors</Authors>
12-
<TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
13-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
14-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
15-
<AssemblyName>SixLabors.Shapes.Text</AssemblyName>
16-
<PackageId>SixLabors.Shapes.Text</PackageId>
17-
<PackageTags>shapes;text;</PackageTags>
18-
<PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/shapes/sixlabors.shapes.128.png</PackageIconUrl>
19-
<PackageProjectUrl>https://github.com/SixLabors/Shapes</PackageProjectUrl>
20-
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
21-
<RepositoryType>git</RepositoryType>
22-
<RepositoryUrl>https://github.com/SixLabors/Shapes</RepositoryUrl>
23-
<DebugType Condition="$(codecov) == 'true'">full</DebugType>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
26-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
27-
</PropertyGroup>
28-
<ItemGroup>
29-
<Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
30-
</ItemGroup>
31-
<ItemGroup>
32-
<AdditionalFiles Include="..\..\stylecop.json" />
33-
</ItemGroup>
34-
<ItemGroup>
35-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
36-
<PrivateAssets>All</PrivateAssets>
37-
</PackageReference>
38-
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0007" />
39-
</ItemGroup>
2+
<PropertyGroup>
3+
<Authors>Six Labors and contributors</Authors>
4+
<Company>Six Labors</Company>
5+
<Copyright>Copyright (c) Six Labors and contributors.</Copyright>
6+
<Description>Allows generating glyphs for text and a fonts for manipulation using SixLabors.Shapes</Description>
7+
<NeutralLanguage>en</NeutralLanguage>
8+
<AssemblyTitle>SixLabors.Shapes.Text</AssemblyTitle>
9+
<VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
10+
<VersionPrefix Condition="$(packageversion) == ''">0.1.0-alpha1</VersionPrefix>
11+
<Authors>Six Labors and contributors</Authors>
12+
<TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
13+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
14+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
15+
<AssemblyName>SixLabors.Shapes.Text</AssemblyName>
16+
<PackageId>SixLabors.Shapes.Text</PackageId>
17+
<PackageTags>shapes;text;</PackageTags>
18+
<PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/shapes/sixlabors.shapes.128.png</PackageIconUrl>
19+
<PackageProjectUrl>https://github.com/SixLabors/Shapes</PackageProjectUrl>
20+
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
21+
<RepositoryType>git</RepositoryType>
22+
<RepositoryUrl>https://github.com/SixLabors/Shapes</RepositoryUrl>
23+
<DebugType Condition="$(codecov) == 'true'">full</DebugType>
24+
</PropertyGroup>
4025

41-
<ItemGroup>
42-
<ProjectReference Include="..\SixLabors.Shapes\SixLabors.Shapes.csproj" />
43-
</ItemGroup>
26+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
27+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
28+
</PropertyGroup>
29+
30+
<ItemGroup>
31+
<Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
32+
</ItemGroup>
33+
34+
<PropertyGroup>
35+
<CodeAnalysisRuleSet>..\..\standards\SixLabors.ruleset</CodeAnalysisRuleSet>
36+
</PropertyGroup>
37+
38+
<ItemGroup>
39+
<AdditionalFiles Include="..\..\standards\stylecop.json" />
40+
</ItemGroup>
41+
42+
<ItemGroup>
43+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.1-beta.61" PrivateAssets="All"/>
44+
<PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0008" />
45+
</ItemGroup>
46+
47+
<ItemGroup>
48+
<ProjectReference Include="..\SixLabors.Shapes\SixLabors.Shapes.csproj" />
49+
</ItemGroup>
4450

4551
</Project>

‎src/SixLabors.Shapes/InternalPath.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ private static bool IsOnSegment(Vector2 p, Vector2 q, Vector2 r)
432432
}
433433

434434
[MethodImpl(MethodImplOptions.AggressiveInlining)]
435-
private static bool IsOnSegment(Segment seg, Vector2 q)
435+
private static bool IsOnSegment(in Segment seg, Vector2 q)
436436
{
437437
return (q.X - Epsilon2) <= seg.Max.X &&
438438
(q.X + Epsilon2) >= seg.Min.X &&
@@ -441,7 +441,7 @@ private static bool IsOnSegment(Segment seg, Vector2 q)
441441
}
442442

443443
[MethodImpl(MethodImplOptions.AggressiveInlining)]
444-
private static bool IsOnSegments(Segment seg1, Segment seg2, Vector2 q)
444+
private static bool IsOnSegments(in Segment seg1, in Segment seg2, Vector2 q)
445445
{
446446
float t = q.X - Epsilon2;
447447
if (t > seg1.Max.X || t > seg2.Max.X)

‎src/SixLabors.Shapes/SixLabors.Shapes.csproj

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,46 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<Authors>Six Labors and contributors</Authors>
4-
<Company>Six Labors</Company>
5-
<Copyright>Copyright (c) Six Labors and contributors.</Copyright>
6-
<Description>Fully managed polygon manipulation/merging and interrogation library targeting netstandard.</Description>
7-
<NeutralLanguage>en</NeutralLanguage>
8-
<AssemblyTitle>SixLabors.Shapes</AssemblyTitle>
9-
<VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
10-
<VersionPrefix Condition="$(packageversion) == ''">0.1.0-alpha1</VersionPrefix>
11-
<TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
12-
<LangVersion>7.3</LangVersion>
13-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
14-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
15-
<AssemblyName>SixLabors.Shapes</AssemblyName>
16-
<PackageId>SixLabors.Shapes</PackageId>
17-
<PackageTags>polygon;rectangle;point in polygon;complex polygons;shape;2D</PackageTags>
18-
<PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/shapes/sixlabors.shapes.128.png</PackageIconUrl>
19-
<PackageProjectUrl>https://github.com/SixLabors/Shapes</PackageProjectUrl>
20-
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
21-
<RepositoryType>git</RepositoryType>
22-
<RepositoryUrl>https://github.com/SixLabors/Shapes</RepositoryUrl>
23-
<DebugType Condition="$(codecov) == 'true'">full</DebugType>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
26-
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
27-
</PropertyGroup>
28-
<ItemGroup>
29-
<Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
30-
</ItemGroup>
31-
<ItemGroup>
32-
<AdditionalFiles Include="..\..\stylecop.json" />
33-
</ItemGroup>
34-
<PropertyGroup>
35-
<CodeAnalysisRuleSet>..\..\SixLabors.Shapes.ruleset</CodeAnalysisRuleSet>
36-
</PropertyGroup>
37-
<ItemGroup>
38-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
39-
<PrivateAssets>All</PrivateAssets>
40-
</PackageReference>
41-
<PackageReference Include="SixLabors.Core" Version="1.0.0-dev000094" />
42-
</ItemGroup>
2+
<PropertyGroup>
3+
<Authors>Six Labors and contributors</Authors>
4+
<Company>Six Labors</Company>
5+
<Copyright>Copyright (c) Six Labors and contributors.</Copyright>
6+
<Description>Fully managed polygon manipulation/merging and interrogation library targeting netstandard.</Description>
7+
<NeutralLanguage>en</NeutralLanguage>
8+
<AssemblyTitle>SixLabors.Shapes</AssemblyTitle>
9+
<VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
10+
<VersionPrefix Condition="$(packageversion) == ''">0.1.0-alpha1</VersionPrefix>
11+
<TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
12+
<LangVersion>7.3</LangVersion>
13+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
14+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
15+
<AssemblyName>SixLabors.Shapes</AssemblyName>
16+
<PackageId>SixLabors.Shapes</PackageId>
17+
<PackageTags>polygon;rectangle;point in polygon;complex polygons;shape;2D</PackageTags>
18+
<PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/shapes/sixlabors.shapes.128.png</PackageIconUrl>
19+
<PackageProjectUrl>https://github.com/SixLabors/Shapes</PackageProjectUrl>
20+
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
21+
<RepositoryType>git</RepositoryType>
22+
<RepositoryUrl>https://github.com/SixLabors/Shapes</RepositoryUrl>
23+
<DebugType Condition="$(codecov) == 'true'">full</DebugType>
24+
</PropertyGroup>
25+
26+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
27+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
28+
</PropertyGroup>
29+
30+
<ItemGroup>
31+
<Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
32+
</ItemGroup>
33+
34+
<ItemGroup>
35+
<AdditionalFiles Include="..\..\standards\stylecop.json" />
36+
</ItemGroup>
37+
38+
<PropertyGroup>
39+
<CodeAnalysisRuleSet>..\..\standards\SixLabors.ruleset</CodeAnalysisRuleSet>
40+
</PropertyGroup>
41+
42+
<ItemGroup>
43+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.1-beta.61" PrivateAssets="All"/>
44+
<PackageReference Include="SixLabors.Core" Version="1.0.0-beta0007" />
45+
</ItemGroup>
4346
</Project>

‎standards

Submodule standards added at dd83f64

‎stylecop.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)