From b3c9af9061e09efd94a1f5bd58aed69800da237d Mon Sep 17 00:00:00 2001 From: Zajcev Evgeny Date: Thu, 17 Dec 2020 01:04:09 +0300 Subject: [PATCH] Improvements for `:base-uri' svg image property * src/image.c (svg_load): Use ENCODE_FILE for `:base-uri' * doc/lispref/display.texi (SVG Images): Add more documentation for `:base-uri' --- doc/lispref/display.texi | 8 +++++++- src/image.c | 8 +++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 2b3119ea590..949fd8987c2 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -5904,7 +5904,13 @@ string containing the image data as raw bytes. @var{image-type} should be a To @var{svg} add an embedded (raster) image placed at @var{relative-filename}. @var{relative-filename} is searched inside @code{file-name-directory} of the @code{:base-uri} svg image property. -This improves the performance of embedding large images. +@code{:base-uri} specifies a (possibly non-existing) file name of the +svg image to be created, thus all the embedded files are searched +relatively to the @code{:base-uri} filename's directory. If +@code{:base-uri} is ommited, then filename from where svg image is +loaded is used. Using @code{:base-uri} improves the performance of +embedding large images, comparing to @code{svg-embed}, because all the +work is done directly by librsvg. @lisp ;; Embeding /tmp/subdir/rms.jpg and /tmp/another/rms.jpg diff --git a/src/image.c b/src/image.c index 29cd189f177..e99ba09f515 100644 --- a/src/image.c +++ b/src/image.c @@ -9803,8 +9803,9 @@ svg_load (struct frame *f, struct image *img) } /* If the file was slurped into memory properly, parse it. */ if (!STRINGP (base_uri)) - base_uri = ENCODE_FILE (file); - success_p = svg_load_image (f, img, contents, size, SSDATA (base_uri)); + base_uri = file; + success_p = svg_load_image (f, img, contents, size, + SSDATA (ENCODE_FILE (base_uri))); xfree (contents); } /* Else it's not a file, it's a Lisp object. Load the image from a @@ -9822,7 +9823,8 @@ svg_load (struct frame *f, struct image *img) if (!STRINGP (base_uri)) base_uri = BVAR (current_buffer, filename); success_p = svg_load_image (f, img, SSDATA (data), SBYTES (data), - (NILP (base_uri) ? NULL : SSDATA (base_uri))); + (STRINGP (base_uri) ? + SSDATA (ENCODE_FILE (base_uri)) : NULL)); } return success_p; -- 2.39.5