Skip to content

Fix multiple SVG import rendering bugs in masks and gradient strokes. #3503

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

Open
OnionsYu wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix multiple SVG import rendering bugs in masks and gradient strokes. #3503

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
fdd262e
Fix invisible mask layers being merged with visible shape layers caus…
OnionsYu Jun 11, 2026
77fe244
Apply stroke-opacity to gradient strokes to match SVG rendering.
OnionsYu Jun 11, 2026
cc18a22
Honor SVG mask-type attribute to preserve mask alpha rendering on imp…
OnionsYu Jun 11, 2026
1e33b13
Update baseline for svg_Guidelines and svg_Overview after SVG mask-ty…
OnionsYu Jun 11, 2026
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
30 changes: 19 additions & 11 deletions src/pagx/svg/SVGImporter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,10 @@ Layer* SVGParserContext::convertToLayer(const std::shared_ptr<DOMNode>& element,
auto maskLayer = convertMaskElement(maskIt->second, inheritedStyle);
if (maskLayer) {
layer->mask = maskLayer;
// SVG masks use luminance by default.
layer->maskType = MaskType::Luminance;
// SVG mask-type property determines how the mask is computed.
// Default is "luminance" (uses luminance of mask content); "alpha" uses alpha channel.
std::string maskTypeStr = getAttribute(maskIt->second, "mask-type");
layer->maskType = (maskTypeStr == "alpha") ? MaskType::Alpha : MaskType::Luminance;
// Add mask layer as invisible layer to the document.
_maskLayers.push_back(maskLayer);
}
Expand Down Expand Up @@ -1817,6 +1819,15 @@ void SVGParserContext::addFillStroke(const std::shared_ptr<DOMNode>& element,

auto strokeNode = _document->makeNode<Stroke>();

// Determine effective stroke-opacity. Applies to both url() and solid color strokes.
std::string strokeOpacity = getAttribute(element, "stroke-opacity");
if (strokeOpacity.empty()) {
strokeOpacity = inheritedStyle.strokeOpacity;
}
if (!strokeOpacity.empty()) {
strokeNode->alpha = strtof(strokeOpacity.c_str(), nullptr);
}

if (stroke.compare(0, 4, "url(") == 0) {
std::string refId = resolveUrl(stroke);
// Use getColorSourceForRef which handles reference counting.
Expand All @@ -1826,15 +1837,6 @@ void SVGParserContext::addFillStroke(const std::shared_ptr<DOMNode>& element,
}
strokeNode->color = getColorSourceForRef(refId, shapeBounds);
} else {
// Determine effective stroke-opacity.
std::string strokeOpacity = getAttribute(element, "stroke-opacity");
if (strokeOpacity.empty()) {
strokeOpacity = inheritedStyle.strokeOpacity;
}
if (!strokeOpacity.empty()) {
strokeNode->alpha = strtof(strokeOpacity.c_str(), nullptr);
}

// Convert color to SolidColor for PAGX compatibility.
// SolidColor is always inlined (no id).
Color parsedColor = parseColor(stroke);
Expand Down Expand Up @@ -2792,6 +2794,12 @@ static bool isSimpleShapeLayer(const Layer* layer, const Element*& outGeometry,
if (!layer || layer->contents.size() != 2) {
return false;
}
// Invisible layers (e.g., mask reference layers) must not be merged with visible layers,
// even when they share the same geometry. Otherwise the visible layer's painter would be
// pulled into the invisible layer and disappear from the final output.
if (!layer->visible) {
return false;
}
if (!layer->children.empty() || !layer->filters.empty() || !layer->styles.empty()) {
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions test/baseline/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8812,8 +8812,8 @@
"spec_trim_path": "eb9361216",
"svg_Baseline": "73083086",
"svg_ColorPicker": "eb9361216",
"svg_Guidelines": "14d4d93b7",
"svg_Overview": "451bc13e",
"svg_Guidelines": "cc18a22e",
"svg_Overview": "cc18a22e",
"svg_Switch": "73083086",
"svg_UIkit": "eb9361216",
"svg_blur": "b4fef60e9",
Expand Down
Loading