MyouProject/pixie
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simpler

Browse source
This commit is contained in:
Ryan Oldenburg 2022-05-21 16:42:34 -05:00
parent 7cba9e5ca3
commit acc1d6bc93
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/pixie/fileformats/svg.nim
View file

@ -345,7 +345,7 @@ proc stroke(img: Image, ctx: Ctx, path: Path) {.inline.} =
dashes = ctx.strokeDashArray dashes = ctx.strokeDashArray
) )
proc drawInternal(img: Image, node: XmlNode, ctxStack: var seq[Ctx]) = proc draw(img: Image, node: XmlNode, ctxStack: var seq[Ctx]) =
if node.kind != xnElement: if node.kind != xnElement:
# Skip <!-- comments --> # Skip <!-- comments -->
return return
@ -362,7 +362,7 @@ proc drawInternal(img: Image, node: XmlNode, ctxStack: var seq[Ctx]) =
let ctx = decodeCtx(ctxStack[^1], node) let ctx = decodeCtx(ctxStack[^1], node)
ctxStack.add(ctx) ctxStack.add(ctx)
for child in node: for child in node:
img.drawInternal(child, ctxStack) img.draw(child, ctxStack)
discard ctxStack.pop() discard ctxStack.pop()
of "path": of "path":
@ -552,14 +552,6 @@ proc drawInternal(img: Image, node: XmlNode, ctxStack: var seq[Ctx]) =
else: else:
raise newException(PixieError, "Unsupported SVG tag: " & node.tag) raise newException(PixieError, "Unsupported SVG tag: " & node.tag)
proc draw(img: Image, node: XmlNode, ctxStack: var seq[Ctx]) =
try:
drawInternal(img, node, ctxStack)
except PixieError as e:
raise e
except:
raise currentExceptionAsPixieError()
proc decodeSvg*( proc decodeSvg*(
data: string | XmlNode, width = 0, height = 0 data: string | XmlNode, width = 0, height = 0
): Image {.raises: [PixieError].} = ): Image {.raises: [PixieError].} =