Merge pull request #59 from SixLabors/beta8

Update dependencies + remove struct copy
SixLabors · Jan 25, 2019 · bca6cb1 · bca6cb1
2 parents 5dee898 + 0cc805e
commit bca6cb1
Show file tree

Hide file tree

Showing 11 changed files with 105 additions and 113 deletions.
diff --git a/.editorconfig b/.editorconfig
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "standards"]
+	path = standards
+	url = https://github.com/SixLabors/Standards
diff --git a/SixLabors.Shapes.ruleset b/SixLabors.Shapes.ruleset
diff --git a/SixLabors.Shapes.sln b/SixLabors.Shapes.sln
@@ -5,11 +5,13 @@ VisualStudioVersion = 15.0.26430.6
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{C317F1B1-D75E-4C6D-83EB-80367343E0D7}"
 	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
+		standards\.editorconfig = standards\.editorconfig
 		appveyor.yml = appveyor.yml
 		build.cmd = build.cmd
 		NuGet.config = NuGet.config
 		README.md = README.md
+		standards\SixLabors.ruleset = standards\SixLabors.ruleset
+		standards\stylecop.json = standards\stylecop.json
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{815C0625-CD3D-440F-9F80-2D83856AB7AE}"

diff --git a/appveyor.yml b/appveyor.yml
@@ -4,6 +4,7 @@ image: Visual Studio 2017
 install:
 
 before_build:
+  - git submodule -q update --init
   - cmd: dotnet --version
 
 build_script:

diff --git a/src/SixLabors.Shapes.Text/BaseGlyphBuilder.cs b/src/SixLabors.Shapes.Text/BaseGlyphBuilder.cs
@@ -44,16 +44,16 @@ void IGlyphRenderer.EndText()
         }
 
         /// <inheritdoc/>
-        void IGlyphRenderer.BeginText(RectangleF rect)
+        void IGlyphRenderer.BeginText(RectangleF bounds)
         {
-            this.BeginText(rect);
+            this.BeginText(bounds);
         }
 
         /// <inheritdoc/>
-        bool IGlyphRenderer.BeginGlyph(RectangleF rect, GlyphRendererParameters glyphDetails)
+        bool IGlyphRenderer.BeginGlyph(RectangleF bounds, GlyphRendererParameters paramaters)
         {
             this.builder.Clear();
-            this.BeginGlyph(rect);
+            this.BeginGlyph(bounds);
             return true;
         }
 

diff --git a/src/SixLabors.Shapes.Text/SixLabors.Shapes.Text.csproj b/src/SixLabors.Shapes.Text/SixLabors.Shapes.Text.csproj
@@ -1,45 +1,51 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <Authors>Six Labors and contributors</Authors>
-        <Company>Six Labors</Company>
-        <Copyright>Copyright (c) Six Labors and contributors.</Copyright>      
-        <Description>Allows generating glyphs for text and a font for manipulation using SixLabors.Shapes</Description>
-        <NeutralLanguage>en</NeutralLanguage>
-        <AssemblyTitle>SixLabors.Shapes.Text</AssemblyTitle>
-        <VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
-        <VersionPrefix Condition="$(packageversion) == ''">0.1.0-alpha1</VersionPrefix>
-        <Authors>Six Labors and contributors</Authors>
-        <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <AssemblyName>SixLabors.Shapes.Text</AssemblyName>
-        <PackageId>SixLabors.Shapes.Text</PackageId>
-        <PackageTags>shapes;text;</PackageTags>
-        <PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/shapes/sixlabors.shapes.128.png</PackageIconUrl>
-        <PackageProjectUrl>https://github.com/SixLabors/Shapes</PackageProjectUrl>
-        <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
-        <RepositoryType>git</RepositoryType>
-        <RepositoryUrl>https://github.com/SixLabors/Shapes</RepositoryUrl>
-        <DebugType Condition="$(codecov) == 'true'">full</DebugType>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    </PropertyGroup>
-    <ItemGroup>
-        <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    </ItemGroup>
-    <ItemGroup>
-        <AdditionalFiles Include="..\..\stylecop.json" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
-            <PrivateAssets>All</PrivateAssets>
-        </PackageReference>
-        <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0007" />
-    </ItemGroup>
+  <PropertyGroup>
+    <Authors>Six Labors and contributors</Authors>
+    <Company>Six Labors</Company>
+    <Copyright>Copyright (c) Six Labors and contributors.</Copyright>
+    <Description>Allows generating glyphs for text and a fonts for manipulation using SixLabors.Shapes</Description>
+    <NeutralLanguage>en</NeutralLanguage>
+    <AssemblyTitle>SixLabors.Shapes.Text</AssemblyTitle>
+    <VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
+    <VersionPrefix Condition="$(packageversion) == ''">0.1.0-alpha1</VersionPrefix>
+    <Authors>Six Labors and contributors</Authors>
+    <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>SixLabors.Shapes.Text</AssemblyName>
+    <PackageId>SixLabors.Shapes.Text</PackageId>
+    <PackageTags>shapes;text;</PackageTags>
+    <PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/shapes/sixlabors.shapes.128.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/SixLabors/Shapes</PackageProjectUrl>
+    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/SixLabors/Shapes</RepositoryUrl>
+    <DebugType Condition="$(codecov) == 'true'">full</DebugType>
+  </PropertyGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\SixLabors.Shapes\SixLabors.Shapes.csproj" />
-    </ItemGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <CodeAnalysisRuleSet>..\..\standards\SixLabors.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="..\..\standards\stylecop.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.1-beta.61" PrivateAssets="All"/>
+    <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0008" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\SixLabors.Shapes\SixLabors.Shapes.csproj" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/SixLabors.Shapes/InternalPath.cs b/src/SixLabors.Shapes/InternalPath.cs
@@ -432,7 +432,7 @@ private static bool IsOnSegment(Vector2 p, Vector2 q, Vector2 r)
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static bool IsOnSegment(Segment seg, Vector2 q)
+        private static bool IsOnSegment(in Segment seg, Vector2 q)
         {
             return (q.X - Epsilon2) <= seg.Max.X &&
                     (q.X + Epsilon2) >= seg.Min.X &&
@@ -441,7 +441,7 @@ private static bool IsOnSegment(Segment seg, Vector2 q)
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static bool IsOnSegments(Segment seg1, Segment seg2, Vector2 q)
+        private static bool IsOnSegments(in Segment seg1, in Segment seg2, Vector2 q)
         {
             float t = q.X - Epsilon2;
             if (t > seg1.Max.X || t > seg2.Max.X)

diff --git a/src/SixLabors.Shapes/SixLabors.Shapes.csproj b/src/SixLabors.Shapes/SixLabors.Shapes.csproj
@@ -1,43 +1,46 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <Authors>Six Labors and contributors</Authors>
-        <Company>Six Labors</Company>
-        <Copyright>Copyright (c) Six Labors and contributors.</Copyright>
-        <Description>Fully managed polygon manipulation/merging and interrogation library targeting netstandard.</Description>
-        <NeutralLanguage>en</NeutralLanguage>
-        <AssemblyTitle>SixLabors.Shapes</AssemblyTitle>
-        <VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
-        <VersionPrefix Condition="$(packageversion) == ''">0.1.0-alpha1</VersionPrefix>
-        <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
-        <LangVersion>7.3</LangVersion>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <AssemblyName>SixLabors.Shapes</AssemblyName>
-        <PackageId>SixLabors.Shapes</PackageId>
-        <PackageTags>polygon;rectangle;point in polygon;complex polygons;shape;2D</PackageTags>
-        <PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/shapes/sixlabors.shapes.128.png</PackageIconUrl>
-        <PackageProjectUrl>https://github.com/SixLabors/Shapes</PackageProjectUrl>
-        <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
-        <RepositoryType>git</RepositoryType>
-        <RepositoryUrl>https://github.com/SixLabors/Shapes</RepositoryUrl>
-        <DebugType Condition="$(codecov) == 'true'">full</DebugType>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    </PropertyGroup>
-    <ItemGroup>
-        <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
-    </ItemGroup>
-    <ItemGroup>
-        <AdditionalFiles Include="..\..\stylecop.json" />
-    </ItemGroup>
-    <PropertyGroup>
-        <CodeAnalysisRuleSet>..\..\SixLabors.Shapes.ruleset</CodeAnalysisRuleSet>
-    </PropertyGroup>
-    <ItemGroup>
-        <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004">
-            <PrivateAssets>All</PrivateAssets>
-        </PackageReference>
-        <PackageReference Include="SixLabors.Core" Version="1.0.0-dev000094" />
-    </ItemGroup>
+  <PropertyGroup>
+    <Authors>Six Labors and contributors</Authors>
+    <Company>Six Labors</Company>
+    <Copyright>Copyright (c) Six Labors and contributors.</Copyright>
+    <Description>Fully managed polygon manipulation/merging and interrogation library targeting netstandard.</Description>
+    <NeutralLanguage>en</NeutralLanguage>
+    <AssemblyTitle>SixLabors.Shapes</AssemblyTitle>
+    <VersionPrefix Condition="$(packageversion) != ''">$(packageversion)</VersionPrefix>
+    <VersionPrefix Condition="$(packageversion) == ''">0.1.0-alpha1</VersionPrefix>
+    <TargetFrameworks>netstandard1.3;netstandard2.0</TargetFrameworks>
+    <LangVersion>7.3</LangVersion>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>SixLabors.Shapes</AssemblyName>
+    <PackageId>SixLabors.Shapes</PackageId>
+    <PackageTags>polygon;rectangle;point in polygon;complex polygons;shape;2D</PackageTags>
+    <PackageIconUrl>https://raw.githubusercontent.com/SixLabors/Branding/master/icons/shapes/sixlabors.shapes.128.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/SixLabors/Shapes</PackageProjectUrl>
+    <PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/SixLabors/Shapes</RepositoryUrl>
+    <DebugType Condition="$(codecov) == 'true'">full</DebugType>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Shared\*.cs" Exclude="bin\**;obj\**;**\*.xproj;packages\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <AdditionalFiles Include="..\..\standards\stylecop.json" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <CodeAnalysisRuleSet>..\..\standards\SixLabors.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="StyleCop.Analyzers" Version="1.1.1-beta.61" PrivateAssets="All"/>
+    <PackageReference Include="SixLabors.Core" Version="1.0.0-beta0007" />
+  </ItemGroup>
 </Project>
diff --git a/standards b/standards
diff --git a/stylecop.json b/stylecop.json