From 635ec22edc6431285c9cdebc315bfdae0ba62105 Mon Sep 17 00:00:00 2001
From: Mira Grudzinska <m.grudzinska@samsung.com>
Date: Tue, 21 Sep 2021 03:11:47 +0200
Subject: [PATCH] svg loader: converting the image path to the absolute one

The href image tag should point to an absolute image path.
---
 src/examples/images/image-embeded.svg  |   6 +++---
 src/examples/images/logo.png           | Bin 0 -> 15174 bytes
 src/loaders/svg/tvgSvgLoader.cpp       |   3 ++-
 src/loaders/svg/tvgSvgLoader.h         |   1 +
 src/loaders/svg/tvgSvgSceneBuilder.cpp |  19 ++++++++++++-------
 src/loaders/svg/tvgSvgSceneBuilder.h   |   2 +-
 6 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 src/examples/images/logo.png

diff --git a/src/examples/images/image-embeded.svg b/src/examples/images/image-embeded.svg
index 8f0712a..3104bec 100644
--- a/src/examples/images/image-embeded.svg
+++ b/src/examples/images/image-embeded.svg
@@ -7,6 +7,6 @@
 	<image href="data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'%3E%3Ccircle cx='50' cy='50' r='48' fill='none' stroke='%23000'/%3E%3Cpath d='M50,2a48,48 0 1 1 0,96a24 24 0 1 1 0-48a24 24 0 1 0 0-48'/%3E%3Ccircle cx='50' cy='26' r='6'/%3E%3Ccircle cx='50' cy='74' r='6' fill='%23FFF'/%3E%3C/svg%3E%0A" height="100" width="100" x="0" y="0" />
 	<image href="data:image/svg+xml;utf8,%3Csvg+xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27+viewBox%3D%270+0+100+100%27%3E%3Ccircle+cx%3D%2750%27+cy%3D%2750%27+r%3D%2748%27+fill%3D%27none%27+stroke%3D%27%23000%27%2F%3E%3Cpath+d%3D%27M50%2C2a48%2C48+0+1+1+0%2C96a24+24+0+1+1+0-48a24+24+0+1+0+0-48%27%2F%3E%3Ccircle+cx%3D%2750%27+cy%3D%2726%27+r%3D%276%27%2F%3E%3Ccircle+cx%3D%2750%27+cy%3D%2774%27+r%3D%276%27+fill%3D%27%23FFF%27%2F%3E%3C%2Fsvg%3E%0D%0A" height="100" width="100" x="100" y="0" />
 	<image href="data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIHZpZXdCb3g9JzAgMCAxMDAgMTAwJz48Y2lyY2xlIGN4PSc1MCcgY3k9JzUwJyByPSc0OCcgZmlsbD0nbm9uZScgc3Ryb2tlPScjMDAwJy8+PHBhdGggZD0nTTUwLDJhNDgsNDggMCAxIDEgMCw5NmEyNCAyNCAwIDEgMSAwLTQ4YTI0IDI0IDAgMSAwIDAtNDgnLz48Y2lyY2xlIGN4PSc1MCcgY3k9JzI2JyByPSc2Jy8+PGNpcmNsZSBjeD0nNTAnIGN5PSc3NCcgcj0nNicgZmlsbD0nI0ZGRicvPjwvc3ZnPg0K" height="100" width="100" x="0" y="100" />
-	<image href="src/examples/images/yinyang.svg" height="100" width="100" x="100" y="100" />
-	<image href="src/examples/images/logo.png" height="80" width="80" x="60" y="60" clip-path="url(#circleView)" />
-</svg>
\ No newline at end of file
+	<image href="yinyang.svg" height="100" width="100" x="100" y="100" />
+	<image href="logo.png" height="80" width="80" x="60" y="60" clip-path="url(#circleView)" />
+</svg>
diff --git a/src/examples/images/logo.png b/src/examples/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b08abf8b6ca7116a0eeafbeb783014c0faf08ca4
GIT binary patch
literal 15174
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
PsNJ*ENIzw}?XUj>=Yg`$

literal 0
HcmV?d00001

diff --git a/src/loaders/svg/tvgSvgLoader.cpp b/src/loaders/svg/tvgSvgLoader.cpp
index 88b2496..c1b3b33 100644
--- a/src/loaders/svg/tvgSvgLoader.cpp
+++ b/src/loaders/svg/tvgSvgLoader.cpp
@@ -2788,7 +2788,7 @@ void SvgLoader::run(unsigned tid)
 
         if (loaderData.cloneNodes.count > 0) _clonePostponedNodes(&loaderData.cloneNodes);
     }
-    root = svgSceneBuild(loaderData.doc, vx, vy, vw, vh, w, h, preserveAspect);
+    root = svgSceneBuild(loaderData.doc, vx, vy, vw, vh, w, h, preserveAspect, svgPath);
 }
 
 
@@ -2857,6 +2857,7 @@ bool SvgLoader::open(const string& path)
 
     if (!f.is_open()) return false;
 
+    svgPath = path;
     getline(f, filePath, '\0');
     f.close();
 
diff --git a/src/loaders/svg/tvgSvgLoader.h b/src/loaders/svg/tvgSvgLoader.h
index 01e90d4..468f058 100644
--- a/src/loaders/svg/tvgSvgLoader.h
+++ b/src/loaders/svg/tvgSvgLoader.h
@@ -29,6 +29,7 @@ class SvgLoader : public LoadModule, public Task
 {
 public:
     string filePath;
+    string svgPath = "";
     const char* content = nullptr;
     uint32_t size = 0;
 
diff --git a/src/loaders/svg/tvgSvgSceneBuilder.cpp b/src/loaders/svg/tvgSvgSceneBuilder.cpp
index 0026af4..fe7a2db 100644
--- a/src/loaders/svg/tvgSvgSceneBuilder.cpp
+++ b/src/loaders/svg/tvgSvgSceneBuilder.cpp
@@ -469,7 +469,7 @@ static bool _isValidImageMimeTypeAndEncoding(const char** href, const char** mim
 }
 
 
-static unique_ptr<Picture> _imageBuildHelper(SvgNode* node, float vx, float vy, float vw, float vh)
+static unique_ptr<Picture> _imageBuildHelper(SvgNode* node, float vx, float vy, float vw, float vh, const string& svgPath)
 {
     if (!node->node.image.href) return nullptr;
     auto picture = Picture::gen();
@@ -496,7 +496,12 @@ static unique_ptr<Picture> _imageBuildHelper(SvgNode* node, float vx, float vy,
             TVGLOG("SVG", "Embedded svg file is disabled.");
             return nullptr;
         }
-        if (picture->load(href) != Result::Success) return nullptr;
+        string imagePath = href;
+        if (strncmp(href, "/", 1)) {
+            auto last = svgPath.find_last_of("/");
+            imagePath = svgPath.substr(0, (last == string::npos ? 0 : last + 1 )) + imagePath;
+        }
+        if (picture->load(imagePath) != Result::Success) return nullptr;
     }
 
     float w, h;
@@ -512,7 +517,7 @@ static unique_ptr<Picture> _imageBuildHelper(SvgNode* node, float vx, float vy,
 }
 
 
-static unique_ptr<Scene> _sceneBuildHelper(const SvgNode* node, float vx, float vy, float vw, float vh)
+static unique_ptr<Scene> _sceneBuildHelper(const SvgNode* node, float vx, float vy, float vw, float vh, const string& svgPath)
 {
     if (_isGroupType(node->type)) {
         auto scene = Scene::gen();
@@ -522,9 +527,9 @@ static unique_ptr<Scene> _sceneBuildHelper(const SvgNode* node, float vx, float
             auto child = node->child.data;
             for (uint32_t i = 0; i < node->child.count; ++i, ++child) {
                 if (_isGroupType((*child)->type)) {
-                    scene->push(_sceneBuildHelper(*child, vx, vy, vw, vh));
+                    scene->push(_sceneBuildHelper(*child, vx, vy, vw, vh, svgPath));
                 } else if ((*child)->type == SvgNodeType::Image) {
-                    auto image = _imageBuildHelper(*child, vx, vy, vw, vh);
+                    auto image = _imageBuildHelper(*child, vx, vy, vw, vh, svgPath);
                     if (image) scene->push(move(image));
                 } else {
                     auto shape = _shapeBuildHelper(*child, vx, vy, vw, vh);
@@ -544,11 +549,11 @@ static unique_ptr<Scene> _sceneBuildHelper(const SvgNode* node, float vx, float
 /* External Class Implementation                                        */
 /************************************************************************/
 
-unique_ptr<Scene> svgSceneBuild(SvgNode* node, float vx, float vy, float vw, float vh, float w, float h, bool preserveAspect)
+unique_ptr<Scene> svgSceneBuild(SvgNode* node, float vx, float vy, float vw, float vh, float w, float h, bool preserveAspect, const string& svgPath)
 {
     if (!node || (node->type != SvgNodeType::Doc)) return nullptr;
 
-    auto docNode = _sceneBuildHelper(node, vx, vy, vw, vh);
+    auto docNode = _sceneBuildHelper(node, vx, vy, vw, vh, svgPath);
 
     if (fabsf(w - vw) > FLT_EPSILON || fabsf(h - vh) > FLT_EPSILON) {
         auto sx = w / vw;
diff --git a/src/loaders/svg/tvgSvgSceneBuilder.h b/src/loaders/svg/tvgSvgSceneBuilder.h
index a09e340..4232aca 100644
--- a/src/loaders/svg/tvgSvgSceneBuilder.h
+++ b/src/loaders/svg/tvgSvgSceneBuilder.h
@@ -25,6 +25,6 @@
 
 #include "tvgCommon.h"
 
-unique_ptr<Scene> svgSceneBuild(SvgNode* node, float vx, float vy, float vw, float vh, float w, float h, bool preserveAspect);
+unique_ptr<Scene> svgSceneBuild(SvgNode* node, float vx, float vy, float vw, float vh, float w, float h, bool preserveAspect, const string& svgPath);
 
 #endif //_TVG_SVG_SCENE_BUILDER_H_
-- 
2.7.4