Merge pull request #39 from SixLabors/sw/emoji-support

Update Dependencies and add support for emoji font rendering

Author: tocsoft

.gitignore

@@ -220,7 +220,6 @@ artifacts/
 
 # Tests
 **/Images/ActualOutput
-**/Images/ReferenceOutput
 
 # sample output
 /samples/DrawShapesWithImageSharp/Output/**

.gitmodules

@@ -1,7 +1,3 @@
 [submodule "shared-infrastructure"]
 	path = shared-infrastructure
-	url = https://github.com/SixLabors/SharedInfrastructure
-[submodule "tests/Images/External"]
-	path = tests/Images/External
-	url = https://github.com/SixLabors/Imagesharp.Tests.Images.git
-	branch = master
+	url = https://github.com/SixLabors/SharedInfrastructure

Directory.Build.targets

@@ -23,8 +23,8 @@
     <PackageReference Update="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
 
     <!--Src Dependencies-->
-    <PackageReference Update="SixLabors.Fonts" Version="1.0.0-unstable0032" />
-    <PackageReference Update="SixLabors.ImageSharp" Version="1.0.0-unstable0965" />
+    <PackageReference Update="SixLabors.Fonts" Version="1.0.0-unstable0056" />
+    <PackageReference Update="SixLabors.ImageSharp" Version="1.0.0-rc0001" />
   </ItemGroup>
 
 </Project>

src/ImageSharp.Drawing/Common/Extensions/GraphicsOptionsExtensions.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0.
 
 using System.Numerics;
+using SixLabors.ImageSharp.Drawing.Processing;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace SixLabors.ImageSharp.Drawing

src/ImageSharp.Drawing/Primitives/ShapeRegion.cs

@@ -17,7 +17,9 @@ internal class ShapeRegion : Region
         /// <param name="shape">The shape.</param>
         public ShapeRegion(IPath shape)
         {
-            this.Shape = shape.AsClosedPath();
+            IPath closedPath = shape.AsClosedPath();
+            this.MaxIntersections = closedPath.MaxIntersections;
+            this.Shape = closedPath;
             int left = (int)MathF.Floor(shape.Bounds.Left);
             int top = (int)MathF.Floor(shape.Bounds.Top);
 
@@ -32,7 +34,7 @@ public ShapeRegion(IPath shape)
         public IPath Shape { get; }
 
         /// <inheritdoc/>
-        public override int MaxIntersections => this.Shape.MaxIntersections;
+        public override int MaxIntersections { get; }
 
         /// <inheritdoc/>
         public override Rectangle Bounds { get; }

src/ImageSharp.Drawing/Processing/BrushApplicator.cs

@@ -81,7 +81,7 @@ protected virtual void Dispose(bool disposing)
         /// <param name="x">The x-position in the target pixel space that the start of the scanline data corresponds to.</param>
         /// <param name="y">The y-position in  the target pixel space that whole scanline corresponds to.</param>
         /// <remarks>scanlineBuffer will be > scanlineWidth but provide and offset in case we want to share a larger buffer across runs.</remarks>
-        internal virtual void Apply(Span<float> scanline, int x, int y)
+        public virtual void Apply(Span<float> scanline, int x, int y)
         {
             MemoryAllocator memoryAllocator = this.Configuration.MemoryAllocator;
 

src/ImageSharp.Drawing/Processing/Extensions/DrawBezierExtensions.cs

@@ -10,6 +10,34 @@ namespace SixLabors.ImageSharp.Drawing.Processing
     /// </summary>
     public static class DrawBezierExtensions
     {
+        /// <summary>
+        /// Draws the provided points as an open Bezier path with the supplied pen
+        /// </summary>
+        /// <param name="source">The image this method extends.</param>
+        /// <param name="options">The options.</param>
+        /// <param name="pen">The pen.</param>
+        /// <param name="points">The points.</param>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static IImageProcessingContext DrawBeziers(
+            this IImageProcessingContext source,
+            ShapeGraphicsOptions options,
+            IPen pen,
+            params PointF[] points) =>
+            source.Draw(options, pen, new Path(new CubicBezierLineSegment(points)));
+
+        /// <summary>
+        /// Draws the provided points as an open Bezier path with the supplied pen
+        /// </summary>
+        /// <param name="source">The image this method extends.</param>
+        /// <param name="pen">The pen.</param>
+        /// <param name="points">The points.</param>
+        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
+        public static IImageProcessingContext DrawBeziers(
+            this IImageProcessingContext source,
+            IPen pen,
+            params PointF[] points) =>
+            source.Draw(pen, new Path(new CubicBezierLineSegment(points)));
+
         /// <summary>
         /// Draws the provided points as an open Bezier path at the provided thickness with the supplied brush
         /// </summary>
@@ -73,33 +101,5 @@ public static IImageProcessingContext DrawBeziers(
             float thickness,
             params PointF[] points) =>
             source.DrawBeziers(options, new SolidBrush(color), thickness, points);
-
-        /// <summary>
-        /// Draws the provided points as an open Bezier path with the supplied pen
-        /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="options">The options.</param>
-        /// <param name="pen">The pen.</param>
-        /// <param name="points">The points.</param>
-        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext DrawBeziers(
-            this IImageProcessingContext source,
-            ShapeGraphicsOptions options,
-            IPen pen,
-            params PointF[] points) =>
-            source.Draw(options, pen, new Path(new CubicBezierLineSegment(points)));
-
-        /// <summary>
-        /// Draws the provided points as an open Bezier path with the supplied pen
-        /// </summary>
-        /// <param name="source">The image this method extends.</param>
-        /// <param name="pen">The pen.</param>
-        /// <param name="points">The points.</param>
-        /// <returns>The <see cref="Image{TPixel}"/>.</returns>
-        public static IImageProcessingContext DrawBeziers(
-            this IImageProcessingContext source,
-            IPen pen,
-            params PointF[] points) =>
-            source.Draw(pen, new Path(new CubicBezierLineSegment(points)));
     }
 }

src/ImageSharp.Drawing/Processing/Extensions/DrawPathCollectionExtensions.cs

@@ -41,7 +41,7 @@ public static IImageProcessingContext Draw(
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext
             Draw(this IImageProcessingContext source, IPen pen, IPathCollection paths) =>
-            source.Draw(new ShapeGraphicsOptions(), pen, paths);
+            source.Draw(source.GetShapeGraphicsOptions(), pen, paths);
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.

src/ImageSharp.Drawing/Processing/Extensions/DrawPathExtensions.cs

@@ -1,6 +1,7 @@
 // Copyright (c) Six Labors and contributors.
 // Licensed under the Apache License, Version 2.0.
 
+using SixLabors.ImageSharp.Drawing.Processing.Processors.Drawing;
 using SixLabors.ImageSharp.Processing;
 
 namespace SixLabors.ImageSharp.Drawing.Processing
@@ -23,7 +24,7 @@ public static IImageProcessingContext Draw(
             ShapeGraphicsOptions options,
             IPen pen,
             IPath path) =>
-            source.Fill(options, pen.StrokeFill, new ShapePath(path, pen));
+            source.ApplyProcessor(new DrawPathProcessor(options, pen, path));
 
         /// <summary>
         /// Draws the outline of the polygon with the provided pen.
@@ -33,7 +34,7 @@ public static IImageProcessingContext Draw(
         /// <param name="path">The path.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext Draw(this IImageProcessingContext source, IPen pen, IPath path) =>
-            source.Draw(new ShapeGraphicsOptions(), pen, path);
+            source.Draw(source.GetShapeGraphicsOptions(), pen, path);
 
         /// <summary>
         /// Draws the outline of the polygon with the provided brush at the provided thickness.

src/ImageSharp.Drawing/Processing/Extensions/DrawPolygonExtensions.cs

@@ -11,95 +11,95 @@ namespace SixLabors.ImageSharp.Drawing.Processing
     public static class DrawPolygonExtensions
     {
         /// <summary>
-        /// Draws the provided Points as a closed Linear Polygon with the provided brush at the provided thickness.
+        /// Draws the provided Points as a closed Linear Polygon with the provided Pen.
         /// </summary>
         /// <param name="source">The image this method extends.</param>
-        /// <param name="options">The options.</param>
-        /// <param name="brush">The brush.</param>
-        /// <param name="thickness">The thickness.</param>
+        /// <param name="pen">The pen.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext DrawPolygon(
             this IImageProcessingContext source,
-            ShapeGraphicsOptions options,
-            IBrush brush,
-            float thickness,
+            IPen pen,
             params PointF[] points) =>
-            source.Draw(options, new Pen(brush, thickness), new Polygon(new LinearLineSegment(points)));
+            source.Draw(source.GetShapeGraphicsOptions(), pen, new Polygon(new LinearLineSegment(points)));
 
         /// <summary>
-        /// Draws the provided Points as a closed Linear Polygon with the provided brush at the provided thickness.
+        /// Draws the provided Points as a closed Linear Polygon with the provided Pen.
         /// </summary>
         /// <param name="source">The image this method extends.</param>
-        /// <param name="brush">The brush.</param>
-        /// <param name="thickness">The thickness.</param>
+        /// <param name="options">The options.</param>
+        /// <param name="pen">The pen.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext DrawPolygon(
             this IImageProcessingContext source,
-            IBrush brush,
-            float thickness,
+            ShapeGraphicsOptions options,
+            IPen pen,
             params PointF[] points) =>
-            source.Draw(new Pen(brush, thickness), new Polygon(new LinearLineSegment(points)));
+            source.Draw(options, pen, new Polygon(new LinearLineSegment(points)));
 
         /// <summary>
         /// Draws the provided Points as a closed Linear Polygon with the provided brush at the provided thickness.
         /// </summary>
         /// <param name="source">The image this method extends.</param>
-        /// <param name="color">The color.</param>
+        /// <param name="options">The options.</param>
+        /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext DrawPolygon(
             this IImageProcessingContext source,
-            Color color,
+            ShapeGraphicsOptions options,
+            IBrush brush,
             float thickness,
             params PointF[] points) =>
-            source.DrawPolygon(new SolidBrush(color), thickness, points);
+            source.DrawPolygon(options, new Pen(brush, thickness), points);
 
         /// <summary>
         /// Draws the provided Points as a closed Linear Polygon with the provided brush at the provided thickness.
         /// </summary>
         /// <param name="source">The image this method extends.</param>
-        /// <param name="options">The options.</param>
-        /// <param name="color">The color.</param>
+        /// <param name="brush">The brush.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext DrawPolygon(
             this IImageProcessingContext source,
-            ShapeGraphicsOptions options,
-            Color color,
+            IBrush brush,
             float thickness,
             params PointF[] points) =>
-            source.DrawPolygon(options, new SolidBrush(color), thickness, points);
+            source.DrawPolygon(new Pen(brush, thickness), points);
 
         /// <summary>
-        /// Draws the provided Points as a closed Linear Polygon with the provided Pen.
+        /// Draws the provided Points as a closed Linear Polygon with the provided brush at the provided thickness.
         /// </summary>
         /// <param name="source">The image this method extends.</param>
-        /// <param name="pen">The pen.</param>
+        /// <param name="color">The color.</param>
+        /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext DrawPolygon(
             this IImageProcessingContext source,
-            IPen pen,
+            Color color,
+            float thickness,
             params PointF[] points) =>
-            source.Draw(new ShapeGraphicsOptions(), pen, new Polygon(new LinearLineSegment(points)));
+            source.DrawPolygon(new SolidBrush(color), thickness, points);
 
         /// <summary>
-        /// Draws the provided Points as a closed Linear Polygon with the provided Pen.
+        /// Draws the provided Points as a closed Linear Polygon with the provided brush at the provided thickness.
         /// </summary>
         /// <param name="source">The image this method extends.</param>
         /// <param name="options">The options.</param>
-        /// <param name="pen">The pen.</param>
+        /// <param name="color">The color.</param>
+        /// <param name="thickness">The thickness.</param>
         /// <param name="points">The points.</param>
         /// <returns>The <see cref="Image{TPixel}"/>.</returns>
         public static IImageProcessingContext DrawPolygon(
             this IImageProcessingContext source,
             ShapeGraphicsOptions options,
-            IPen pen,
+            Color color,
+            float thickness,
             params PointF[] points) =>
-            source.Draw(options, pen, new Polygon(new LinearLineSegment(points)));
+            source.DrawPolygon(options, new SolidBrush(color), thickness, points);
     }
 }