From b81edb009eabf2b10f7d34c416af691a8d4952f8 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Sat, 12 May 2018 22:50:17 +0200
Subject: Allow embed on SVG imports

---
 src/object/sp-image.cpp | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

(limited to 'src/object/sp-image.cpp')

diff --git a/src/object/sp-image.cpp b/src/object/sp-image.cpp
index 6fd9e5c1e..3a76b9633 100644
--- a/src/object/sp-image.cpp
+++ b/src/object/sp-image.cpp
@@ -125,6 +125,7 @@ SPImage::SPImage() : SPItem(), SPViewBox() {
     this->color_profile = 0;
 #endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2)
     this->pixbuf = 0;
+    this->on_construct = true;
 }
 
 SPImage::~SPImage() {
@@ -327,7 +328,8 @@ void SPImage::update(SPCtx *ctx, unsigned int flags) {
 
     SPItem::update(ctx, flags);
 
-    if (flags & SP_IMAGE_HREF_MODIFIED_FLAG) {
+    if ((flags & SP_IMAGE_HREF_MODIFIED_FLAG) || this->on_construct) {
+        this->on_construct = false;
         delete this->pixbuf;
         this->pixbuf = NULL;
 
@@ -510,24 +512,24 @@ gchar* SPImage::description() const {
                                     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;
-        }
-    }
+//    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;
-- 
cgit v1.2.3