Skip to content

Fix feConvolveMatrix default target handling #335

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.

Sign up for GitHub

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
wieslawsoltes merged 4 commits into from
Jul 15, 2025
Merged

Fix feConvolveMatrix default target handling #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fbad81
fix feConvolveMatrix default target
wieslawsoltes Jul 15, 2025
a27d8a6
fix convolve matrix order
wieslawsoltes Jul 15, 2025
d46c721
Update resvgTests.cs
wieslawsoltes Jul 15, 2025
2123b39
Update resvgTests.cs
wieslawsoltes Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/Svg.Model/SvgFilterContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1276,12 +1276,6 @@ private void Apply(byte[] values, SvgComponentTransferFunction transferFunction)
{
TransformsService.GetOptionalNumbers(svgConvolveMatrix.Order, 3f, 3f, out var orderX, out var orderY);

if (_primitiveUnits == SvgCoordinateUnits.ObjectBoundingBox)
{
orderX *= _skBounds.Width;
orderY *= _skBounds.Height;
}

if (orderX <= 0f || orderY <= 0f)
{
return default;
Expand Down Expand Up @@ -1323,7 +1317,19 @@ private void Apply(byte[] values, SvgComponentTransferFunction transferFunction)

var gain = 1f / divisor;
var bias = svgConvolveMatrix.Bias * 255f;
var kernelOffset = new SKPointI(svgConvolveMatrix.TargetX, svgConvolveMatrix.TargetY);
var targetX = svgConvolveMatrix.TargetX;
var targetY = svgConvolveMatrix.TargetY;
if (!svgConvolveMatrix.ContainsAttribute("targetX"))
{
targetX = (int)Math.Floor(orderX / 2f);
}
if (!svgConvolveMatrix.ContainsAttribute("targetY"))
{
targetY = (int)Math.Floor(orderY / 2f);
}
targetX = Math.Max(0, Math.Min(targetX, (int)orderX - 1));
targetY = Math.Max(0, Math.Min(targetY, (int)orderY - 1));
var kernelOffset = new SKPointI(targetX, targetY);
var tileMode = svgConvolveMatrix.EdgeMode switch
{
SvgEdgeMode.Duplicate => SKShaderTileMode.Clamp,
Expand Down
24 changes: 12 additions & 12 deletions tests/Svg.Skia.UnitTests/resvgTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -867,13 +867,13 @@ private void TestImpl(string name, double errorThreshold, float scaleX = 1.5f, f
public void e_feComposite(string name, double errorThreshold) => TestImpl(name, errorThreshold);

[Theory]
[InlineData("e-feConvolveMatrix-001", 0.022, Skip = "TODO")]
[InlineData("e-feConvolveMatrix-002", 0.022, Skip = "TODO")]
[InlineData("e-feConvolveMatrix-003", 0.022, Skip = "TODO")]
[InlineData("e-feConvolveMatrix-001", 0.022)]
[InlineData("e-feConvolveMatrix-002", 0.022)]
[InlineData("e-feConvolveMatrix-003", 0.022)]
[InlineData("e-feConvolveMatrix-004", 0.022)]
[InlineData("e-feConvolveMatrix-005", 0.022)]
[InlineData("e-feConvolveMatrix-006", 0.022)]
[InlineData("e-feConvolveMatrix-007", 0.022, Skip = "TODO")]
[InlineData("e-feConvolveMatrix-007", 0.022)]
[InlineData("e-feConvolveMatrix-008", 0.022)]
[InlineData("e-feConvolveMatrix-009", 0.022)]
[InlineData("e-feConvolveMatrix-010", 0.022)]
Expand All @@ -884,14 +884,14 @@ private void TestImpl(string name, double errorThreshold, float scaleX = 1.5f, f
[InlineData("e-feConvolveMatrix-015", 0.022, Skip = "TODO")]
[InlineData("e-feConvolveMatrix-016", 0.022, Skip = "TODO")]
[InlineData("e-feConvolveMatrix-017", 0.022)]
[InlineData("e-feConvolveMatrix-018", 0.022)]
[InlineData("e-feConvolveMatrix-019", 0.022, Skip = "TODO")]
[InlineData("e-feConvolveMatrix-020", 0.022, Skip = "TODO")]
[InlineData("e-feConvolveMatrix-021", 0.022)]
[InlineData("e-feConvolveMatrix-022", 0.022, Skip = "TODO")]
[InlineData("e-feConvolveMatrix-023", 0.022, Skip = "TODO")]
[InlineData("e-feConvolveMatrix-024", 0.022, Skip = "TODO")]
[InlineData("e-feConvolveMatrix-025", 0.022, Skip = "TODO")]
[InlineData("e-feConvolveMatrix-018", 0.022, Skip = "TODO")]
[InlineData("e-feConvolveMatrix-019", 0.022)]
[InlineData("e-feConvolveMatrix-020", 0.022)]
[InlineData("e-feConvolveMatrix-021", 0.022, Skip = "TODO")]
[InlineData("e-feConvolveMatrix-022", 0.022)]
[InlineData("e-feConvolveMatrix-023", 0.022)]
[InlineData("e-feConvolveMatrix-024", 0.022)]
[InlineData("e-feConvolveMatrix-025", 0.022)]
public void e_feConvolveMatrix(string name, double errorThreshold) => TestImpl(name, errorThreshold);

[Theory]
Expand Down
Loading