From 1f67c1d6892272e1331cc5542c3b08f27954bbe4 Mon Sep 17 00:00:00 2001
From: Michal Maciola <m.maciola@samsung.com>
Date: Fri, 2 Jul 2021 13:05:10 +0200
Subject: [PATCH] svg_loader: <image> tag introduced fix #6

Moved file:// removing into _imageBuildHelper
---
 src/loaders/svg/tvgSvgLoader.cpp       | 1 -
 src/loaders/svg/tvgSvgSceneBuilder.cpp | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/loaders/svg/tvgSvgLoader.cpp b/src/loaders/svg/tvgSvgLoader.cpp
index a71b19c1..092c327b 100644
--- a/src/loaders/svg/tvgSvgLoader.cpp
+++ b/src/loaders/svg/tvgSvgLoader.cpp
@@ -1534,7 +1534,6 @@ static string* _idFromHref(const char* href)
 {
     href = _skipSpace(href, nullptr);
     if ((*href) == '#') href++;
-    if(!strncmp(href, "file://", sizeof("file://") - 1)) href += sizeof("file://") - 1;
     return new string(href);
 }
 
diff --git a/src/loaders/svg/tvgSvgSceneBuilder.cpp b/src/loaders/svg/tvgSvgSceneBuilder.cpp
index c8639e01..eea05336 100644
--- a/src/loaders/svg/tvgSvgSceneBuilder.cpp
+++ b/src/loaders/svg/tvgSvgSceneBuilder.cpp
@@ -432,6 +432,7 @@ static unique_ptr<Picture> _imageBuildHelper(SvgNode* node, float vx, float vy,
         }
 
     } else {
+        if(!strncmp(href, "file://", sizeof("file://") - 1)) href += sizeof("file://") - 1;
         //TODO: protect against recursive svg image loading
         if (picture->load(href) != Result::Success) return nullptr;
         picture->size(node->node.image.w, node->node.image.h);