-
-
Notifications
You must be signed in to change notification settings - Fork 46
Backport improvements from TechPizzaDev fork. #366
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
JimBobSquarePants
merged 37 commits into
SixLabors:main
from
TechPizzaDev:js/updates-to-backport
Oct 30, 2025
Merged
Changes from all commits
Commits
Show all changes
37 commits
Select commit
Hold shift + click to select a range
4561a3c
Add hacked AGG stroker
JimBobSquarePants 52c5312
Update PolygonStroker.cs
JimBobSquarePants bed3722
Actually use the width
JimBobSquarePants 558de97
Bad hack to attempt to close path
JimBobSquarePants 7527241
Close the polygons on stroking.
JimBobSquarePants 3c8b5d3
Clip dashed paths
JimBobSquarePants 319b80d
Wire up options
JimBobSquarePants 0a70463
Cleanup
JimBobSquarePants 2152cec
Use latest ImageSharp build
JimBobSquarePants 4fdddc4
Added Blaze to some benchmarks
TechPizzaDev 99a6283
Optimized ArrayBuilder
TechPizzaDev 4569fe7
Cleaned up PolygonStroker.Accumulate
TechPizzaDev 0285e5d
Reduce allocs in InternalPath
TechPizzaDev 4bfa88b
Add methods on PolygonStroker for manually composing (line) paths
TechPizzaDev 0dbfc38
Lazy-init bezier drawing points
TechPizzaDev 5703f58
Access list of paths directly in RichTextGlyphRenderer
TechPizzaDev 0e0d9bf
Reduce ILineSegment[] copies for Path classes
TechPizzaDev 975c453
Derive EllipsePolygon from Polygon
TechPizzaDev 5448713
Lazy-init InternalPaths and Bounds in ComplexPolygon
TechPizzaDev 9b91ee4
Cleanup DrawPolygon
TechPizzaDev d3ec07c
Improve copying in ClipperOffset
TechPizzaDev d819f81
Merge main into blaze
TechPizzaDev 70da339
Merge branch 'main' into blaze
JimBobSquarePants f8a963b
Update ImageSharp.Drawing.csproj
JimBobSquarePants c5c823c
Fix merge conflicts and missing test output
JimBobSquarePants 018962b
Get solution building.
JimBobSquarePants 9e8c991
Fix benchmark csproj file.
JimBobSquarePants 72bd892
Strip out blaze so we can port back improvements.
JimBobSquarePants c40f450
Remove DebugFast
JimBobSquarePants 1e06414
Remove DebugFast
JimBobSquarePants 539e09d
Remove bad target framework declaration
JimBobSquarePants f71184b
Merge branch 'blaze' into js/updates-to-backport
JimBobSquarePants 4cf8fa3
Remove more bad target framework declarations
JimBobSquarePants b976617
Merge branch 'blaze' into js/updates-to-backport
JimBobSquarePants ea766fd
Try matching build process with ImageSharp
JimBobSquarePants fdbb390
Update build-and-test.yml
JimBobSquarePants 9c877af
Try using the no-deps package
JimBobSquarePants File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,6 @@ | ||
| // Copyright (c) Six Labors. | ||
| // Licensed under the Six Labors Split License. | ||
|
|
||
| using System.Numerics; | ||
|
|
||
| namespace SixLabors.ImageSharp.Drawing; | ||
|
|
||
| /// <summary> | ||
|
|
@@ -28,20 +26,19 @@ public static bool IsOpaqueColorWithoutBlending(this GraphicsOptions options, Co | |
| return false; | ||
| } | ||
|
|
||
| if (options.AlphaCompositionMode != PixelAlphaCompositionMode.SrcOver | ||
| && options.AlphaCompositionMode != PixelAlphaCompositionMode.Src) | ||
| if (options.AlphaCompositionMode is not PixelAlphaCompositionMode.SrcOver and not PixelAlphaCompositionMode.Src) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| const float Opaque = 1F; | ||
| const float opaque = 1f; | ||
|
|
||
| if (options.BlendPercentage != Opaque) | ||
| if (options.BlendPercentage != opaque) | ||
| { | ||
| return false; | ||
| } | ||
|
|
||
| if (color.ToScaledVector4().W != Opaque) | ||
| if (color.ToScaledVector4().W != opaque) | ||
|
||
| { | ||
| return false; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -292,7 +292,7 @@ protected override void EndGlyph() | |
| } | ||
|
|
||
| // Path has already been added to the collection via the base class. | ||
| IPath path = this.Paths.Last(); | ||
| IPath path = this.PathList[^1]; | ||
|
||
| Point renderLocation = ClampToPixel(path.Bounds.Location); | ||
| if (this.noCache || this.rasterizationRequired) | ||
| { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -2,6 +2,7 @@ | |||||
| // Licensed under the Six Labors Split License. | ||||||
|
|
||||||
| using System.Buffers; | ||||||
| using System.Diagnostics.CodeAnalysis; | ||||||
| using System.Numerics; | ||||||
|
|
||||||
| namespace SixLabors.ImageSharp.Drawing; | ||||||
|
|
@@ -14,8 +15,9 @@ namespace SixLabors.ImageSharp.Drawing; | |||||
| public sealed class ComplexPolygon : IPath, IPathInternals, IInternalPathOwner | ||||||
| { | ||||||
| private readonly IPath[] paths; | ||||||
| private readonly List<InternalPath> internalPaths; | ||||||
| private readonly float length; | ||||||
| private List<InternalPath>? internalPaths; | ||||||
| private float length; | ||||||
| private RectangleF? bounds; | ||||||
|
|
||||||
| /// <summary> | ||||||
| /// Initializes a new instance of the <see cref="ComplexPolygon"/> class. | ||||||
|
|
@@ -45,53 +47,10 @@ public ComplexPolygon(params IPath[] paths) | |||||
| Guard.NotNull(paths, nameof(paths)); | ||||||
|
|
||||||
| this.paths = paths; | ||||||
| this.internalPaths = new List<InternalPath>(this.paths.Length); | ||||||
|
|
||||||
| if (paths.Length > 0) | ||||||
| { | ||||||
| float minX = float.MaxValue; | ||||||
| float maxX = float.MinValue; | ||||||
| float minY = float.MaxValue; | ||||||
| float maxY = float.MinValue; | ||||||
| float length = 0; | ||||||
|
|
||||||
| foreach (IPath p in this.paths) | ||||||
| { | ||||||
| if (p.Bounds.Left < minX) | ||||||
| { | ||||||
| minX = p.Bounds.Left; | ||||||
| } | ||||||
|
|
||||||
| if (p.Bounds.Right > maxX) | ||||||
| { | ||||||
| maxX = p.Bounds.Right; | ||||||
| } | ||||||
|
|
||||||
| if (p.Bounds.Top < minY) | ||||||
| { | ||||||
| minY = p.Bounds.Top; | ||||||
| } | ||||||
|
|
||||||
| if (p.Bounds.Bottom > maxY) | ||||||
| { | ||||||
| maxY = p.Bounds.Bottom; | ||||||
| } | ||||||
|
|
||||||
| foreach (ISimplePath s in p.Flatten()) | ||||||
| { | ||||||
| InternalPath ip = new(s.Points, s.IsClosed); | ||||||
| length += ip.Length; | ||||||
| this.internalPaths.Add(ip); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| this.length = length; | ||||||
| this.Bounds = new RectangleF(minX, minY, maxX - minX, maxY - minY); | ||||||
| } | ||||||
| else | ||||||
| if (paths.Length == 0) | ||||||
| { | ||||||
| this.length = 0; | ||||||
| this.Bounds = RectangleF.Empty; | ||||||
| this.bounds = RectangleF.Empty; | ||||||
| } | ||||||
|
|
||||||
| this.PathType = PathTypes.Mixed; | ||||||
|
|
@@ -106,7 +65,7 @@ public ComplexPolygon(params IPath[] paths) | |||||
| public IEnumerable<IPath> Paths => this.paths; | ||||||
|
|
||||||
| /// <inheritdoc/> | ||||||
| public RectangleF Bounds { get; } | ||||||
| public RectangleF Bounds => this.bounds ??= this.CalcBounds(); | ||||||
|
|
||||||
| /// <inheritdoc/> | ||||||
| public IPath Transform(Matrix3x2 matrix) | ||||||
|
|
@@ -118,10 +77,10 @@ public IPath Transform(Matrix3x2 matrix) | |||||
| } | ||||||
|
|
||||||
| IPath[] shapes = new IPath[this.paths.Length]; | ||||||
| int i = 0; | ||||||
| foreach (IPath s in this.Paths) | ||||||
|
|
||||||
| for (int i = 0; i < shapes.Length; i++) | ||||||
| { | ||||||
| shapes[i++] = s.Transform(matrix); | ||||||
| shapes[i] = this.paths[i].Transform(matrix); | ||||||
| } | ||||||
|
|
||||||
| return new ComplexPolygon(shapes); | ||||||
|
|
@@ -159,6 +118,11 @@ public IPath AsClosedPath() | |||||
| /// <inheritdoc/> | ||||||
| SegmentInfo IPathInternals.PointAlongPath(float distance) | ||||||
| { | ||||||
| if (this.internalPaths == null) | ||||||
| { | ||||||
| this.InitInternalPaths(); | ||||||
| } | ||||||
|
|
||||||
| distance %= this.length; | ||||||
| foreach (InternalPath p in this.internalPaths) | ||||||
| { | ||||||
|
|
@@ -177,7 +141,49 @@ SegmentInfo IPathInternals.PointAlongPath(float distance) | |||||
|
|
||||||
| /// <inheritdoc/> | ||||||
| IReadOnlyList<InternalPath> IInternalPathOwner.GetRingsAsInternalPath() | ||||||
| => this.internalPaths; | ||||||
| { | ||||||
| this.InitInternalPaths(); | ||||||
| return this.internalPaths; | ||||||
|
||||||
| return this.internalPaths; | |
| return this.internalPaths!; |
Comment on lines
+175
to
+183
Copilot
AI
Oct 30, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This foreach loop immediately maps its iteration variable to another variable - consider mapping the sequence explicitly using '.Select(...)'.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Equality checks on floating point values can yield unexpected results.