Merge remote-tracking branch 'refs/remotes/origin/master' into experiments-no-packed-color

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>An extension to ImageSharp that allows the drawing of images, paths, and text.</Description>
     <AssemblyTitle>ImageSharp.Drawing</AssemblyTitle>
-    <VersionPrefix>1.0.0-alpha5</VersionPrefix>
+    <VersionPrefix>1.0.0-alpha6</VersionPrefix>
     <Authors>James Jackson-South and contributors</Authors>
     <TargetFramework>netstandard1.1</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -39,8 +39,8 @@
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta001">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="SixLabors.Fonts" Version="0.1.0-alpha0005" />
-    <PackageReference Include="SixLabors.Shapes" Version="0.1.0-alpha0010" />
+    <PackageReference Include="SixLabors.Fonts" Version="0.1.0-alpha0008" />
+    <PackageReference Include="SixLabors.Shapes" Version="0.1.0-alpha0011" />
   </ItemGroup>
   <PropertyGroup>
     <CodeAnalysisRuleSet>..\..\ImageSharp.ruleset</CodeAnalysisRuleSet>

src/ImageSharp.Drawing/Text/GlyphBuilder.cs

@@ -48,7 +48,8 @@ namespace ImageSharp.Drawing
         /// <summary>
         /// Begins the glyph.
         /// </summary>
-        void IGlyphRenderer.BeginGlyph()
+        /// <param name="location">The offset that the glyph will be rendered at.</param>
+        void IGlyphRenderer.BeginGlyph(Vector2 location)
         {
             this.builder.Clear();
         }

src/ImageSharp/ImageSharp.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>A cross-platform library for the processing of image files; written in C#</Description>
     <AssemblyTitle>ImageSharp</AssemblyTitle>
-    <VersionPrefix>1.0.0-alpha5</VersionPrefix>
+    <VersionPrefix>1.0.0-alpha6</VersionPrefix>
     <Authors>James Jackson-South and contributors</Authors>
     <TargetFrameworks>netstandard1.3;netstandard1.1</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>

tests/ImageSharp.Tests/Drawing/Text/GlyphBuilder.cs

@@ -19,7 +19,7 @@ namespace ImageSharp.Tests.Drawing.Text
             GlyphBuilder fullBuilder = new GlyphBuilder(new System.Numerics.Vector2(10, 99));
             IGlyphRenderer builder = fullBuilder;
 
-            builder.BeginGlyph();
+            builder.BeginGlyph(Vector2.Zero);
             builder.BeginFigure();
             builder.MoveTo(new Vector2(0, 0));
             builder.LineTo(new Vector2(0, 10)); // becomes 0, -10
@@ -52,7 +52,7 @@ namespace ImageSharp.Tests.Drawing.Text
             IGlyphRenderer builder = fullBuilder;
             for (int i = 0; i < 10; i++)
             {
-                builder.BeginGlyph();
+                builder.BeginGlyph(Vector2.Zero);
                 builder.BeginFigure();
                 builder.MoveTo(new Vector2(0, 0));
                 builder.LineTo(new Vector2(0, 10)); // becomes 0, -10