bump six labors - #1169
Merged
Merged
Conversation
There was a problem hiding this comment.
Pull Request Overview
This PR updates the SixLabors dependencies to their latest versions and adapts the image‐processing code to breaking API changes in ImageSharp, ImageSharp.Drawing, and SixLabors.Fonts.
- Bumped
SixLabors.ImageSharp,SixLabors.ImageSharp.Drawing, andSixLabors.Fontspackage versions. - Migrated from older drawing/renderer options APIs (e.g.,
ShapeGraphicsOptions,RendererOptions) to the newDrawingOptions,TextOptions, etc. - Replaced deprecated constructors and methods (e.g.,
Image.Load(..., out var format),ConfigurationModule) with the updated overloads and configuration types.
Reviewed Changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| src/Peachpie.Runtime/Variables.cs | Annotated string return types as nullable and added nullability annotation for out parameters. |
| src/Peachpie.Library.Graphics/PhpGdImageResource.cs | Updated IBrush to Brush and adapted constructors to new config interfaces. |
| src/Peachpie.Library.Graphics/PhpGd2.cs | Switched to new ImageSharp.Drawing APIs, updated XML docs, and replaced deprecated SixLabors calls. |
| src/Peachpie.Library.Graphics/Peachpie.Library.Graphics.csproj | Bumped SixLabors package versions to 3.x/2.x series. |
| src/Peachpie.Library.Graphics/FloodFillProcessor{TPixel}.cs | Wrapped pixel operations in ProcessPixelRows and switched to GetRowSpan. |
| src/Peachpie.Library.Graphics/Exif.cs | Refactored Exif handling to use updated SixLabors metadata APIs and pattern matching. |
|
|
||
| /// <summary> | ||
| /// When the bundled version of GD is used this is 1 otherwise its set to 0. | ||
| /// When the bundled version of GD is used, this is 1 otherwise it's set to 0. |
There was a problem hiding this comment.
[nitpick] The summary line would read more clearly with punctuation between clauses. Consider: "When the bundled version of GD is used, this is 1; otherwise, it's set to 0."
Suggested change
| /// When the bundled version of GD is used, this is 1 otherwise it's set to 0. | |
| /// When the bundled version of GD is used, this is 1; otherwise, it's set to 0. |
| <PackageReference Include="SixLabors.Fonts" Version="1.0.0-beta0013" /> | ||
| <PackageReference Include="SixLabors.ImageSharp" Version="3.1.10" /> | ||
| <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.6" /> | ||
| <PackageReference Include="SixLabors.Fonts" Version="2.1.3" /> |
There was a problem hiding this comment.
[nitpick] The SixLabors.ImageSharp.Drawing package is at 2.1.6 while SixLabors.Fonts is at 2.1.3. Consider aligning minor/patch versions across related SixLabors packages to avoid potential compatibility issues.
Suggested change
| <PackageReference Include="SixLabors.Fonts" Version="2.1.3" /> | |
| <PackageReference Include="SixLabors.Fonts" Version="2.1.6" /> |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
update SixLabors dependencies to latest version
ref #1144