fix handling of <defs> after <g> #123
Conversation
| static NSVGgradientLink* nsvg__createGradientLink(const char* id, const float *xform) | ||
| { | ||
| NSVGgradientLink* grad = (NSVGgradientLink*)malloc(sizeof(NSVGgradientLink)); | ||
| if (grad == NULL) return NULL; |
There was a problem hiding this comment.
We should not return NULL because nsvg__createGradient(...NULL...) will crash
There was a problem hiding this comment.
You're right, that logic was flawed. Modified the checks for NULL in nsvg__addShape (where nsvg__createGradientLink is called) to reset type to NSVG_PAINT_NONE in this case. That way, nsvg__createGradient will not get called (nsvg__assignGradients checks for type == NSVG_PAINT_GRADIENT_LINK).
| NSVGgradientData* data = NULL; | ||
| NSVGgradientData* ref = NULL; | ||
| NSVGgradientStop* stops = NULL; | ||
| NSVGgradient* grad; | ||
| float ox, oy, sw, sh, sl; | ||
| int nstops = 0; | ||
|
|
||
| data = nsvg__findGradientData(p, id); | ||
| data = nsvg__findGradientData(p, link->id); |
There was a problem hiding this comment.
I changed nsvg__assignGradientsto gracefully handle type == NSVG_PAINT_GRADIENT_LINK && gradientLink == NULL (which, with the modification above, should never happen anyway, so we should be safe now).
|
All is good now. |
|
Please merge! |
poke1024
force-pushed
the
fix-defs-order
branch
from
a573824 to
02072e0
Compare
|
I'm closing this in favour of #157, which I think is the cleaner and better solution. |
Some SVGs (like the ones exported from Affinity Designer) have their
<defs>tags after their<g>tags. Example file:gradient-circles.svg.zip
Currently, NanoSVG will miss those tags as they're not yet available at the time
<g>is parsed (i.e. the shapes needing those gradient will not be painted). This PR fixes this by relaying the resolution of gradient names to a point when the whole XML has been parsed.Rendering without PR (background not part of NanoSVG rendering):
Rendering with PR (background not part of NanoSVG rendering):