fly/fgdata
1
0
Fork 0
Code Activity

canvas:svg: Fix SVG parser to accept rect without optional x,y

Browse source 
In evalCSSNum return if arg is empty.
Set missing x or y in rect to 0.
This commit is contained in:
Henning 2023-12-03 11:16:49 +01:00
parent a25c607e01
commit e83cc5678f
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Nasal/canvas/svg.nas
View file

@ -32,6 +32,9 @@ var parsesvg = func(group, path, options = nil)
# Helper to get number without unit (eg. px) # Helper to get number without unit (eg. px)
var evalCSSNum = func(css_num) var evalCSSNum = func(css_num)
{ {
if (css_num == nil)
return;
if( css_num.ends_with("px") ) if( css_num.ends_with("px") )
return substr(css_num, 0, size(css_num) - 2); return substr(css_num, 0, size(css_num) - 2);
else if( css_num.ends_with("%") ) else if( css_num.ends_with("%") )
@ -486,6 +489,10 @@ var parsesvg = func(group, path, options = nil)
{ {
var width = evalCSSNum(attr['width']); var width = evalCSSNum(attr['width']);
var height = evalCSSNum(attr['height']); var height = evalCSSNum(attr['height']);
if (!contains(attr, 'x'))
attr['x'] = 0;
if (!contains(attr, 'y'))
attr['y'] = 0;
var x = evalCSSNum(attr['x']); var x = evalCSSNum(attr['x']);
var y = evalCSSNum(attr['y']); var y = evalCSSNum(attr['y']);
var rx = attr['rx']; var rx = attr['rx'];