summaryrefslogtreecommitdiffstats
path: root/src/object
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2018-05-12 00:26:49 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2018-05-12 00:26:49 +0000
commit3b42c3d705f97584d1cf614240aa1da7ce01a94b (patch)
tree4fa75458ce1e84e35a53d62b1fd32daada22423e /src/object
parentAdd Maren improvements prepare to merge (diff)
downloadinkscape-3b42c3d705f97584d1cf614240aa1da7ce01a94b.tar.gz
inkscape-3b42c3d705f97584d1cf614240aa1da7ce01a94b.zip
Fixes bugs: #1770760, #1770761, #1770763, #1770769 related to linked SVG
Diffstat (limited to 'src/object')
-rw-r--r--src/object/sp-image.cpp20
1 files changed, 20 insertions, 0 deletions
diff --git a/src/object/sp-image.cpp b/src/object/sp-image.cpp
index 8d3a15f0b..6fd9e5c1e 100644
--- a/src/object/sp-image.cpp
+++ b/src/object/sp-image.cpp
@@ -509,6 +509,26 @@ gchar* SPImage::description() const {
this->pixbuf->width(),
this->pixbuf->height(),
href_desc) );
+
+ if (this->pixbuf == NULL &&
+ this->document)
+ {
+ Inkscape::Pixbuf * pb = NULL;
+ pb = sp_image_repr_read_image (
+ this->getRepr()->attribute("xlink:href"),
+ this->getRepr()->attribute("sodipodi:absref"),
+ this->document->getBase());
+
+ if (pb) {
+ ret = ( pb == NULL ? g_strdup_printf(_("[bad reference]: %s"), href_desc)
+ : g_strdup_printf(_("%d &#215; %d: %s"),
+ pb->width(),
+ pb->height(),
+ href_desc));
+ delete pb;
+ }
+ }
+
g_free(href_desc);
return ret;
}