remove OrientationHandling customization

Author: antonfirsov

src/ImageSharp.Drawing/Processing/Processors/Drawing/FillRegionProcessor{TPixel}.cs

@@ -77,8 +77,7 @@ protected override void OnFrameApply(ImageFrame<TPixel> source)
                 maxY,
                 subpixelCount,
                 shapeOptions.IntersectionRule,
-                configuration.MemoryAllocator,
-                shapeOptions.OrientationHandling);
+                configuration.MemoryAllocator);
 
             try
             {

src/ImageSharp.Drawing/Processing/Processors/Text/DrawTextProcessor{TPixel}.cs

@@ -389,8 +389,7 @@ private Buffer2D<float> Render(IPath path)
                     size.Height,
                     subpixelCount,
                     IntersectionRule.Nonzero,
-                    this.MemoryAllocator,
-                    this.Options.TextOptions.OrientationHandling);
+                    this.MemoryAllocator);
 
                 try
                 {

src/ImageSharp.Drawing/Processing/ShapeOptions.cs

@@ -20,7 +20,6 @@ public ShapeOptions()
         private ShapeOptions(ShapeOptions source)
         {
             this.IntersectionRule = source.IntersectionRule;
-            this.OrientationHandling = source.OrientationHandling;
         }
 
         /// <summary>
@@ -29,9 +28,6 @@ private ShapeOptions(ShapeOptions source)
         /// </summary>
         public IntersectionRule IntersectionRule { get; set; } = IntersectionRule.OddEven;
 
-        internal OrientationHandling OrientationHandling { get; set; } =
-            OrientationHandling.ForcePositiveOrientationOnSimplePolygons;
-
         /// <inheritdoc/>
         public ShapeOptions DeepClone() => new ShapeOptions(this);
     }

src/ImageSharp.Drawing/Processing/TextOptions.cs

@@ -35,7 +35,6 @@ private TextOptions(TextOptions source)
             this.VerticalAlignment = source.VerticalAlignment;
             this.FallbackFonts.AddRange(source.FallbackFonts);
             this.RenderColorFonts = source.RenderColorFonts;
-            this.OrientationHandling = source.OrientationHandling;
         }
 
         /// <summary>
@@ -131,9 +130,6 @@ public float DpiY
         /// </summary>
         public bool RenderColorFonts { get; set; } = true;
 
-        internal OrientationHandling OrientationHandling { get; set; } =
-            OrientationHandling.ForcePositiveOrientationOnSimplePolygons;
-
         /// <inheritdoc/>
         public TextOptions DeepClone() => new TextOptions(this);
     }

src/ImageSharp.Drawing/Shapes/Rasterization/PolygonScanner.cs

@@ -96,12 +96,11 @@ public static PolygonScanner Create(
             int maxY,
             int subsampling,
             IntersectionRule intersectionRule,
-            MemoryAllocator allocator,
-            OrientationHandling orientationHandling)
+            MemoryAllocator allocator)
         {
-            TessellatedMultipolygon multipolygon = TessellatedMultipolygon.Create(polygon, allocator, orientationHandling);
-            ScanEdgeCollection edges = ScanEdgeCollection.Create(multipolygon, allocator, subsampling);
-            PolygonScanner scanner = new PolygonScanner(edges, multipolygon.TotalVertexCount * 2, minY, maxY, subsampling, intersectionRule, allocator);
+            var multipolygon = TessellatedMultipolygon.Create(polygon, allocator);
+            var edges = ScanEdgeCollection.Create(multipolygon, allocator, subsampling);
+            var scanner = new PolygonScanner(edges, multipolygon.TotalVertexCount * 2, minY, maxY, subsampling, intersectionRule, allocator);
             scanner.Init();
             return scanner;
         }

src/ImageSharp.Drawing/Shapes/Rasterization/ScanEdgeCollection.cs

@@ -40,11 +40,10 @@ public void Dispose()
         public static ScanEdgeCollection Create(
             IPath polygon,
             MemoryAllocator allocator,
-            int subsampling,
-            OrientationHandling orientationHandling = OrientationHandling.FirstRingIsContourFollowedByHoles)
+            int subsampling)
         {
-            TessellatedMultipolygon multipolygon = TessellatedMultipolygon.Create(polygon, allocator, orientationHandling);
+            TessellatedMultipolygon multipolygon = TessellatedMultipolygon.Create(polygon, allocator, OrientationHandling.ForcePositiveOrientationOnSimplePolygons);
             return Create(multipolygon, allocator, subsampling);
         }
     }
-}
+}

tests/ImageSharp.Drawing.Tests/Drawing/FillPolygonTests.cs

@@ -93,13 +93,12 @@ public void FillPolygon_Complex<TPixel>(TestImageProvider<TPixel> provider, bool
             ComplexPolygon polygon = new ComplexPolygon(
                 new Path(new LinearLineSegment(contour)),
                 new Path(new LinearLineSegment(hole)));
-            
+
             provider.RunValidatingProcessorTest(
                 c =>
                 {
                     c.SetShapeOptions(new ShapeOptions()
                     {
-                        OrientationHandling = OrientationHandling.KeepOriginal,
                         IntersectionRule = intersectionRule
                     });
                     c.Fill(Color.White, polygon);
@@ -133,14 +132,7 @@ public void FillPolygon_Concave<TPixel>(TestImageProvider<TPixel> provider, bool
             var color = Color.LightGreen;
 
             provider.RunValidatingProcessorTest(
-                c =>
-                {
-                    c.SetShapeOptions(new ShapeOptions()
-                    {
-                        OrientationHandling = OrientationHandling.KeepOriginal
-                    });
-                    c.FillPolygon(color, points);
-                },
+                c => c.FillPolygon(color, points),
                 testOutputDetails: $"Reverse({reverse})",
                 comparer: ImageComparer.TolerantPercentage(0.01f),
                 appendSourceFileOrDescription: false,
@@ -154,44 +146,14 @@ public void FillPolygon_StarCircle(TestImageProvider<Rgba32> provider)
             EllipsePolygon circle = new EllipsePolygon(32, 32, 30);
             Star star = new Star(32, 32, 7, 10, 27);
             IPath shape = circle.Clip(star);
-            
+
             provider.RunValidatingProcessorTest(
-                c =>
-                {
-                    c.SetShapeOptions(new ShapeOptions()
-                    {
-                        OrientationHandling = OrientationHandling.KeepOriginal
-                    });
-                    c.Fill(Color.White, shape);
-                },
+                c => c.Fill(Color.White, shape),
                 comparer: ImageComparer.TolerantPercentage(0.01f),
                 appendSourceFileOrDescription: false,
                 appendPixelTypeToFileName: false);
         }
 
-        [Theory]
-        [WithSolidFilledImages(30, 30, "Black", PixelTypes.Rgba32)]
-        public void FillPolygon_Reverse<TPixel>(TestImageProvider<TPixel> provider)
-            where TPixel : unmanaged, IPixel<TPixel>
-        {
-            PointF[] points = PolygonFactory.CreatePointArray(
-                (2.5644531f, 2.6796875f),
-                (2.9794922f, 10.443359f),
-                (3.6386719f, 23.382812f),
-                (24.634766f, 23.382812f));
-
-            using var image = provider.GetImage();
-            image.Mutate(c =>
-            {
-                c.SetShapeOptions(new ShapeOptions()
-                {
-                    OrientationHandling = OrientationHandling.KeepOriginal
-                });
-                c.FillPolygon(Color.White, points);
-            });
-            image.DebugSave(provider);
-        }
-
         [Theory]
         [WithBasicTestPatternImages(250, 350, PixelTypes.Rgba32)]
         public void FillPolygon_Pattern<TPixel>(TestImageProvider<TPixel> provider)
@@ -285,16 +247,15 @@ public void Fill_EllipsePolygon<TPixel>(TestImageProvider<TPixel> provider, bool
             {
                 polygon = polygon.Reverse();
             }
-            
+
             var color = Color.Azure;
 
             provider.RunValidatingProcessorTest(
                 c =>
                 {
                     c.SetShapeOptions(new ShapeOptions()
                     {
-                        IntersectionRule = intersectionRule,
-                        OrientationHandling = OrientationHandling.KeepOriginal
+                        IntersectionRule = intersectionRule
                     });
                     c.Fill(color, polygon);
                 },

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

@@ -26,7 +26,7 @@ public class DrawTextOnImageTests
         private const string TestText = "Sphinx of black quartz, judge my vow\n0123456789";
 
         public static ImageComparer TextDrawingComparer = TestEnvironment.IsFramework
-            ? ImageComparer.TolerantPercentage(1e-3f) // Relax comparison on .NET Framework 
+            ? ImageComparer.TolerantPercentage(1e-3f) // Relax comparison on .NET Framework
             : ImageComparer.TolerantPercentage(1e-5f);
 
         public static ImageComparer OutlinedTextDrawingComparer = ImageComparer.TolerantPercentage(5e-4f);
@@ -155,17 +155,9 @@ public void FontShapesAreRenderedCorrectly<TPixel>(
             where TPixel : unmanaged, IPixel<TPixel>
         {
             Font font = CreateFont(fontName, fontSize);
-            var color = Color.Black;
 
             provider.RunValidatingProcessorTest(
-                c =>
-                {
-                    c.SetTextOptions(new TextOptions()
-                    {
-                        OrientationHandling = OrientationHandling.KeepOriginal
-                    });
-                    c.DrawText(text, new Font(font, fontSize), color, new PointF(x, y));
-                },
+                c => c.DrawText(text, font, Color.Black, new PointF(x, y)),
                 $"{fontName}-{fontSize}-{ToTestOutputDisplayText(text)}-({x},{y})",
                 TextDrawingComparer,
                 appendPixelTypeToFileName: false,

tests/ImageSharp.Drawing.Tests/Shapes/Scan/PolygonScannerTests.cs

@@ -70,16 +70,14 @@ private void TestScan(
             int max,
             int subsampling,
             FuzzyFloat[][] expected,
-            IntersectionRule intersectionRule,
-            OrientationHandling orientationHandling = OrientationHandling.FirstRingIsContourFollowedByHoles)
+            IntersectionRule intersectionRule)
         {
             var scanner = PolygonScanner.Create(path,
                 min,
                 max,
                 subsampling,
                 intersectionRule,
-                Configuration.Default.MemoryAllocator,
-                orientationHandling);
+                Configuration.Default.MemoryAllocator);
 
             try
             {
@@ -317,7 +315,7 @@ public void SelfIntersecting03(IntersectionRule rule)
 
             TestScan(poly, 1, 5, 2, expected, rule);
         }
-        
+
         [Theory]
         [InlineData(IntersectionRule.OddEven)]
         [InlineData(IntersectionRule.Nonzero)]
@@ -326,7 +324,7 @@ public void SelfIntersecting04(IntersectionRule rule)
             IPath poly = PolygonFactory.CreatePolygon((1, 4), (1, 3), (3, 3), (3, 2), (2, 2), (2, 4), (1, 4), (1, 1),
                 (4, 1), (4, 4), (3, 4), (3, 5), (2, 5), (2, 4), (1, 4));
             DebugDraw.Polygon(poly, 1f, 100f);
-            
+
             FuzzyFloat[][] expected;
             if (rule == IntersectionRule.OddEven)
             {
@@ -358,17 +356,25 @@ public void SelfIntersecting04(IntersectionRule rule)
                     new FuzzyFloat[] {2, 3},
                 };
             }
-            
+
             TestScan(poly, 1, 5, 2, expected, rule);
         }
-        
-        
+
+
         [Theory]
         [InlineData(IntersectionRule.OddEven)]
         [InlineData(IntersectionRule.Nonzero)]
         public void NegativeOrientation01(IntersectionRule intersectionRule)
         {
-            IPath poly = PolygonFactory.CreatePolygon((0, 0), (0, 2), (2, 2), (2, 0));
+            // IPath poly = PolygonFactory.CreatePolygon((0, 0), (0, 2), (2, 2), (2, 0));
+            PointF[] interest = PolygonFactory.CreatePointArray((0, 0), (0, 2), (2, 2), (2, 0));
+
+            // Adding a dummy ring outside the area of interest, so the actual loop is not oriented positively
+            PointF[] dummy = PolygonFactory.CreatePointArray((0, 10), (10, 10), (0, 11));
+
+            var poly = new ComplexPolygon(
+                new Polygon(new LinearLineSegment(interest)),
+                new Polygon(new LinearLineSegment(dummy)));
 
             FuzzyFloat[][] expected =
             {
@@ -378,8 +384,8 @@ public void NegativeOrientation01(IntersectionRule intersectionRule)
                 new FuzzyFloat[] { 0, 2 },
                 new FuzzyFloat[] { 0, 0, 2, 2},
             };
-            
-            TestScan(poly, 0, 2, 2, expected, intersectionRule, OrientationHandling.KeepOriginal);
+
+            TestScan(poly, 0, 2, 2, expected, intersectionRule);
         }
 
         private static (float y, FuzzyFloat[] x) Empty(float y) => (y, new FuzzyFloat[0]);
@@ -451,7 +457,7 @@ public void NegativeOrientation01(IntersectionRule intersectionRule)
                     {
                         Empty(4f),
 
-                        // Eps = 0.01 to address inaccuracies on .NET Framework 
+                        // Eps = 0.01 to address inaccuracies on .NET Framework
                         (4.25f, new FuzzyFloat[] { F(13, 0.01f), F(13, 0.01f)}),
                         (4.5f, new FuzzyFloat[] {F(12.714286f, 0.5f), F(13.444444f, 0.5f), 16, 16}),
                         (4.75f, new FuzzyFloat[] {F(12.357143f, 0.5f), 14, 14, 16}),
@@ -510,7 +516,7 @@ public void NumericCornerCases(string name, (float y, FuzzyFloat[] x)[] expected
                     result.Add(offset, (string)data[0], ((float y, FuzzyFloat[] x)[]) data[1]);
                 }
             }
-            
+
             return result;
         }
 
@@ -520,7 +526,7 @@ public void NumericCornerCases_Offset(float offset, string name, (float y, Fuzzy
         {
             float dx = offset;
             float dy = offset;
-            
+
             IPath poly = NumericCornerCasePolygons.GetByName(name).Transform(Matrix3x2.CreateTranslation(dx, dy));
             expectedIntersections = TranslateIntersections(expectedIntersections, dx, dy);