From adda399b271a19da834d0b8c4ca7a7c4bf97567b Mon Sep 17 00:00:00 2001
From: Hermet Park <chuneon.park@samsung.com>
Date: Thu, 20 Jan 2022 12:04:19 +0900
Subject: [PATCH 01/16] svg_loader: ++robustness

Prevent recursive calls by counting just in case.

The size is arbitrary value, we can adjust it experimentally.

@Issue: https://github.com/Samsung/thorvg/issues/1161

Change-Id: I30571e5de085c65980a240b14c592bc0b47a7860
---
 src/loaders/svg/tvgSvgLoader.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/loaders/svg/tvgSvgLoader.cpp b/src/loaders/svg/tvgSvgLoader.cpp
index 74e6144..4990c5c 100644
--- a/src/loaders/svg/tvgSvgLoader.cpp
+++ b/src/loaders/svg/tvgSvgLoader.cpp
@@ -1934,8 +1934,15 @@ static void _copyAttr(SvgNode* to, const SvgNode* from)
 }
 
 
-static void _cloneNode(SvgNode* from, SvgNode* parent)
+static void _cloneNode(SvgNode* from, SvgNode* parent, int depth)
 {
+    /* Exception handling: Prevent invalid SVG data input.
+       The size is the arbitrary value, we need an experimental size. */
+    if (depth == 8192) {
+        TVGERR("SVG", "Infinite recursive call - stopped after %d calls! Svg file may be incorrectly formatted.", depth);
+        return;
+    }
+
     SvgNode* newNode;
     if (!from || !parent || from == parent) return;
 
@@ -1947,7 +1954,7 @@ static void _cloneNode(SvgNode* from, SvgNode* parent)
 
     auto child = from->child.data;
     for (uint32_t i = 0; i < from->child.count; ++i, ++child) {
-        _cloneNode(*child, newNode);
+        _cloneNode(*child, newNode, depth + 1);
     }
 }
 
@@ -1965,7 +1972,7 @@ static void _clonePostponedNodes(Array<SvgNodeIdPair>* cloneNodes, SvgNode* doc)
         auto defs = _getDefsNode(nodeIdPair.node);
         auto nodeFrom = _findChildById(defs, nodeIdPair.id);
         if (!nodeFrom) nodeFrom = _findChildById(doc, nodeIdPair.id);
-        _cloneNode(nodeFrom, nodeIdPair.node);
+        _cloneNode(nodeFrom, nodeIdPair.node, 0);
         free(nodeIdPair.id);
     }
 }
@@ -2006,7 +2013,7 @@ static bool _attrParseUseNode(void* data, const char* key, const char* value)
         defs = _getDefsNode(node);
         nodeFrom = _findChildById(defs, id);
         if (nodeFrom) {
-            _cloneNode(nodeFrom, node);
+            _cloneNode(nodeFrom, node, 0);
             free(id);
         } else {
             //some svg export software include <defs> element at the end of the file
-- 
2.7.4


From 4bf49c05bf258cb4fe237d25745645e32e2cf048 Mon Sep 17 00:00:00 2001
From: jykeon <jykeon@samsung.com>
Date: Mon, 27 Feb 2023 16:53:00 +0900
Subject: [PATCH 02/16] Bump up 0.7.5

Change-Id: I0ce3f00a49467ffd990eeeaf0179171401280177
Signed-off-by: jykeon <jykeon@samsung.com>
---
 packaging/thorvg.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/thorvg.spec b/packaging/thorvg.spec
index a2f5c0d..a53aa64 100644
--- a/packaging/thorvg.spec
+++ b/packaging/thorvg.spec
@@ -1,6 +1,6 @@
 Name:       thorvg
 Summary:    Thor Vector Graphics Library
-Version:    0.7.4
+Version:    0.7.5
 Release:    1
 Group:      Graphics System/Rendering Engine
 License:    MIT
-- 
2.7.4


From b86c6e7236df93ae3434d8dde727dfea8cf742d0 Mon Sep 17 00:00:00 2001
From: Mira Grudzinska <m.grudzinska@samsung.com>
Date: Thu, 20 Jan 2022 13:55:05 +0100
Subject: [PATCH 03/16] sw_engine: float casted on the unsigned int type

uint32_t -> int32_t

Change-Id: I33a7ba842a19acafc2cbe9bfa4bc8f6f79ba7658
---
 src/lib/sw_engine/tvgSwImage.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/sw_engine/tvgSwImage.cpp b/src/lib/sw_engine/tvgSwImage.cpp
index 9b57700..f24d2d6 100644
--- a/src/lib/sw_engine/tvgSwImage.cpp
+++ b/src/lib/sw_engine/tvgSwImage.cpp
@@ -84,8 +84,8 @@ bool imagePrepare(SwImage* image, const Matrix* transform, const SwBBox& clipReg
 
     //Fast track: Non-transformed image but just shifted.
     if (image->direct) {
-        image->ox = -static_cast<uint32_t>(round(transform->e13));
-        image->oy = -static_cast<uint32_t>(round(transform->e23));
+        image->ox = -static_cast<int32_t>(round(transform->e13));
+        image->oy = -static_cast<int32_t>(round(transform->e23));
     //Figure out the scale factor by transform matrix
     } else {
         auto scaleX = sqrtf((transform->e11 * transform->e11) + (transform->e21 * transform->e21));
-- 
2.7.4


From 8d4b1c99d7e87f6d98cc39a3c40b8a6a4bfcbd1d Mon Sep 17 00:00:00 2001
From: Mira Grudzinska <m.grudzinska@samsung.com>
Date: Fri, 21 Jan 2022 23:45:03 +0100
Subject: [PATCH 04/16] examples: terminate the same engine as was initialized

Change-Id: I3e1b3cbee003fa18fdec8b554588d3420473aa08
---
 src/examples/AnimateMasking.cpp  | 2 +-
 src/examples/GradientMasking.cpp | 6 +++---
 src/examples/GradientStroke.cpp  | 2 +-
 src/examples/InvMasking.cpp      | 2 +-
 src/examples/LumaMasking.cpp     | 2 +-
 src/examples/Masking.cpp         | 2 +-
 src/examples/MultiCanvas.cpp     | 6 +++---
 src/examples/PictureJpg.cpp      | 2 +-
 src/examples/PicturePng.cpp      | 4 ++--
 src/examples/PictureRaw.cpp      | 2 +-
 src/examples/Stress.cpp          | 2 +-
 src/examples/Svg.cpp             | 2 +-
 src/examples/Svg2.cpp            | 2 +-
 src/examples/Tvg.cpp             | 2 +-
 14 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/examples/AnimateMasking.cpp b/src/examples/AnimateMasking.cpp
index 7f1ba23..48cbe70 100644
--- a/src/examples/AnimateMasking.cpp
+++ b/src/examples/AnimateMasking.cpp
@@ -103,7 +103,7 @@ void tvgUpdateCmds(tvg::Canvas* canvas, float progress)
        You can update only necessary properties of this shape,
        while retaining other properties. */
 
-    // Translate mask object with its stroke & update 
+    // Translate mask object with its stroke & update
     pMaskShape->translate(0 , progress * 300);
     pMask->translate(0 , progress * 300);
 
diff --git a/src/examples/GradientMasking.cpp b/src/examples/GradientMasking.cpp
index bafc21a..b8b88ea 100644
--- a/src/examples/GradientMasking.cpp
+++ b/src/examples/GradientMasking.cpp
@@ -47,7 +47,7 @@ void tvgDrawCmds(tvg::Canvas* canvas)
     colorStops[1] = {1,255,255,255,255};
     fill->colorStops(colorStops,2);
     shape->fill(move(fill));
- 
+
     shape->composite(move(mask), tvg::CompositeMethod::AlphaMask);
     canvas->push(move(shape));
 
@@ -79,7 +79,7 @@ void tvgDrawCmds(tvg::Canvas* canvas)
     colorStops1[1] = {1,1,255,255,255};
     fill1->colorStops(colorStops1,2);
     shape1->fill(move(fill1));
- 
+
     shape1->composite(move(mask1), tvg::CompositeMethod::AlphaMask);
     canvas->push(move(shape1));
 
@@ -237,7 +237,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvg::CanvasEngine::Sw);
+        tvg::Initializer::term(tvgEngine);
 
     } else {
         cout << "engine is not supported" << endl;
diff --git a/src/examples/GradientStroke.cpp b/src/examples/GradientStroke.cpp
index 8b04aa2..6e2b97e 100644
--- a/src/examples/GradientStroke.cpp
+++ b/src/examples/GradientStroke.cpp
@@ -77,7 +77,7 @@ void tvgDrawCmds(tvg::Canvas* canvas)
 
     if (canvas->push(move(shape1)) != tvg::Result::Success) return;
 
-    // radial gradient stroke + duplicate 
+    // radial gradient stroke + duplicate
     auto shape2 = tvg::Shape::gen();
     shape2->appendCircle(600, 175, 100, 60);
     shape2->stroke(80);
diff --git a/src/examples/InvMasking.cpp b/src/examples/InvMasking.cpp
index cd4b0a3..4b6eb31 100644
--- a/src/examples/InvMasking.cpp
+++ b/src/examples/InvMasking.cpp
@@ -212,7 +212,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvg::CanvasEngine::Sw);
+        tvg::Initializer::term(tvgEngine);
 
     } else {
         cout << "engine is not supported" << endl;
diff --git a/src/examples/LumaMasking.cpp b/src/examples/LumaMasking.cpp
index 45b1548..cb32d1b 100644
--- a/src/examples/LumaMasking.cpp
+++ b/src/examples/LumaMasking.cpp
@@ -208,7 +208,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvg::CanvasEngine::Sw);
+        tvg::Initializer::term(tvgEngine);
 
     } else {
         cout << "engine is not supported" << endl;
diff --git a/src/examples/Masking.cpp b/src/examples/Masking.cpp
index 8b63b0b..88be49a 100644
--- a/src/examples/Masking.cpp
+++ b/src/examples/Masking.cpp
@@ -212,7 +212,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvg::CanvasEngine::Sw);
+        tvg::Initializer::term(tvgEngine);
 
     } else {
         cout << "engine is not supported" << endl;
diff --git a/src/examples/MultiCanvas.cpp b/src/examples/MultiCanvas.cpp
index 006223f..f622a05 100644
--- a/src/examples/MultiCanvas.cpp
+++ b/src/examples/MultiCanvas.cpp
@@ -178,7 +178,7 @@ void tvgGlTest(const char* name, const char* path, void* data)
     objData->name = strdup(name);
     objData->path = strdup(path);
 
-    Eo* win = (Eo*) data;   
+    Eo* win = (Eo*) data;
 
     Eo* view = elm_glview_add(win);
     elm_glview_mode_set(view, ELM_GLVIEW_ALPHA);
@@ -189,7 +189,7 @@ void tvgGlTest(const char* name, const char* path, void* data)
     evas_object_data_set(view, "objdata", reinterpret_cast<void*>(objData));
     evas_object_event_callback_add(view, EVAS_CALLBACK_DEL, gl_del, objData);
     evas_object_resize(view, SIZE, SIZE);
-    evas_object_move(view, (count % NUM_PER_LINE) * SIZE, SIZE * (count / NUM_PER_LINE)); 
+    evas_object_move(view, (count % NUM_PER_LINE) * SIZE, SIZE * (count / NUM_PER_LINE));
     evas_object_show(view);
 }
 
@@ -238,7 +238,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvg::CanvasEngine::Sw);
+        tvg::Initializer::term(tvgEngine);
 
     } else {
         cout << "engine is not supported" << endl;
diff --git a/src/examples/PictureJpg.cpp b/src/examples/PictureJpg.cpp
index df56f3e..c04b34b 100644
--- a/src/examples/PictureJpg.cpp
+++ b/src/examples/PictureJpg.cpp
@@ -169,7 +169,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvg::CanvasEngine::Sw);
+        tvg::Initializer::term(tvgEngine);
 
 
     } else {
diff --git a/src/examples/PicturePng.cpp b/src/examples/PicturePng.cpp
index 0cbaedb..b43926a 100644
--- a/src/examples/PicturePng.cpp
+++ b/src/examples/PicturePng.cpp
@@ -31,7 +31,7 @@ void tvgDrawCmds(tvg::Canvas* canvas)
 {
     if (!canvas) return;
 
-    //Background                            
+    //Background
     auto bg = tvg::Shape::gen();
     bg->appendRect(0, 0, WIDTH, HEIGHT, 0, 0);    //x, y, w, h, rx, ry
     bg->fill(255, 255, 255, 255);                 //r, g, b, a
@@ -175,7 +175,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvg::CanvasEngine::Sw);
+        tvg::Initializer::term(tvgEngine);
 
 
     } else {
diff --git a/src/examples/PictureRaw.cpp b/src/examples/PictureRaw.cpp
index dcb86fc..ea6de16 100644
--- a/src/examples/PictureRaw.cpp
+++ b/src/examples/PictureRaw.cpp
@@ -169,7 +169,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvg::CanvasEngine::Sw);
+        tvg::Initializer::term(tvgEngine);
 
     } else {
         cout << "engine is not supported" << endl;
diff --git a/src/examples/Stress.cpp b/src/examples/Stress.cpp
index 004561b..cd8843d 100644
--- a/src/examples/Stress.cpp
+++ b/src/examples/Stress.cpp
@@ -236,7 +236,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvg::CanvasEngine::Sw);
+        tvg::Initializer::term(tvgEngine);
 
     } else {
         cout << "engine is not supported" << endl;
diff --git a/src/examples/Svg.cpp b/src/examples/Svg.cpp
index be4f357..53e9502 100644
--- a/src/examples/Svg.cpp
+++ b/src/examples/Svg.cpp
@@ -181,7 +181,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvg::CanvasEngine::Sw);
+        tvg::Initializer::term(tvgEngine);
 
     } else {
         cout << "engine is not supported" << endl;
diff --git a/src/examples/Svg2.cpp b/src/examples/Svg2.cpp
index a7c97da..011816e 100644
--- a/src/examples/Svg2.cpp
+++ b/src/examples/Svg2.cpp
@@ -147,7 +147,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvg::CanvasEngine::Sw);
+        tvg::Initializer::term(tvgEngine);
 
     } else {
         cout << "engine is not supported" << endl;
diff --git a/src/examples/Tvg.cpp b/src/examples/Tvg.cpp
index 51c6af8..5512f43 100644
--- a/src/examples/Tvg.cpp
+++ b/src/examples/Tvg.cpp
@@ -181,7 +181,7 @@ int main(int argc, char **argv)
         elm_shutdown();
 
         //Terminate ThorVG Engine
-        tvg::Initializer::term(tvg::CanvasEngine::Sw);
+        tvg::Initializer::term(tvgEngine);
 
     } else {
         cout << "engine is not supported" << endl;
-- 
2.7.4


From 0dfc931de3b9509ead61d02c8c4a364577a297aa Mon Sep 17 00:00:00 2001
From: Mira Grudzinska <m.grudzinska@samsung.com>
Date: Thu, 20 Jan 2022 13:52:57 +0100
Subject: [PATCH 05/16] portability: fixing windows warnings

atan2->atan2f

Change-Id: Ia7572db01a26e0b7d5a6d3ed610cda407a27375f
---
 src/lib/sw_engine/tvgSwRasterTexmapInternal.h | 6 +++---
 src/lib/tvgMath.h                             | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib/sw_engine/tvgSwRasterTexmapInternal.h b/src/lib/sw_engine/tvgSwRasterTexmapInternal.h
index 0cf6cff..f31ea1e 100644
--- a/src/lib/sw_engine/tvgSwRasterTexmapInternal.h
+++ b/src/lib/sw_engine/tvgSwRasterTexmapInternal.h
@@ -58,8 +58,8 @@
     y = yStart;
 
     while (y < yEnd) {
-        x1 = _xa;
-        x2 = _xb;
+        x1 = (int32_t)_xa;
+        x2 = (int32_t)_xb;
 
         if (!region) {
             minx = INT32_MAX;
@@ -160,4 +160,4 @@ next:
     xb = _xb;
     ua = _ua;
     va = _va;
-}
\ No newline at end of file
+}
diff --git a/src/lib/tvgMath.h b/src/lib/tvgMath.h
index d4d3ad9..6120216 100644
--- a/src/lib/tvgMath.h
+++ b/src/lib/tvgMath.h
@@ -47,7 +47,7 @@ static inline bool mathEqual(float a, float b)
 
 static inline bool mathRightAngle(const Matrix* m)
 {
-   auto radian = fabsf(atan2(m->e21, m->e11));
+   auto radian = fabsf(atan2f(m->e21, m->e11));
    if (radian < FLT_EPSILON || mathEqual(radian, float(M_PI_2)) || mathEqual(radian, float(M_PI))) return true;
    return false;
 }
-- 
2.7.4


From 8fa300f2dfb10c5c22e0da5d346cb614aa5f1c62 Mon Sep 17 00:00:00 2001
From: Hermet Park <chuneon.park@samsung.com>
Date: Mon, 24 Jan 2022 20:48:54 +0900
Subject: [PATCH 06/16] loaders jpg: fix all memory leaks.

These were detected by asan with PictureJpg example,

fixed them all.

Change-Id: Ie63bcef3aa40945aa511db6df3fab9cc650c595b
---
 src/loaders/jpg/tvgJpgLoader.cpp | 5 +++++
 src/loaders/jpg/tvgJpgd.cpp      | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/loaders/jpg/tvgJpgLoader.cpp b/src/loaders/jpg/tvgJpgLoader.cpp
index 6795c10..7b90b4a 100644
--- a/src/loaders/jpg/tvgJpgLoader.cpp
+++ b/src/loaders/jpg/tvgJpgLoader.cpp
@@ -47,6 +47,7 @@ JpgLoader::~JpgLoader()
 {
     jpgdDelete(decoder);
     if (freeData) free(data);
+    free(image);
 }
 
 
@@ -128,5 +129,9 @@ unique_ptr<Surface> JpgLoader::bitmap()
 
 void JpgLoader::run(unsigned tid)
 {
+    if (image) {
+        free(image);
+        image = nullptr;
+    }
     image = jpgdDecompress(decoder);
 }
\ No newline at end of file
diff --git a/src/loaders/jpg/tvgJpgd.cpp b/src/loaders/jpg/tvgJpgd.cpp
index 0c74cdf..b80516a 100644
--- a/src/loaders/jpg/tvgJpgd.cpp
+++ b/src/loaders/jpg/tvgJpgd.cpp
@@ -1080,7 +1080,9 @@ namespace DCT_Upsample
 // Unconditionally frees all allocated m_blocks.
 void jpeg_decoder::free_all_blocks()
 {
+    delete(m_pStream);
     m_pStream = nullptr;
+
     for (mem_block *b = m_pMem_blocks; b; ) {
         mem_block *n = b->m_pNext;
         free(b);
@@ -2815,7 +2817,6 @@ int jpeg_decoder::begin_decoding()
 jpeg_decoder::~jpeg_decoder()
 {
     free_all_blocks();
-    delete(m_pStream);
 }
 
 
@@ -3025,4 +3026,4 @@ unsigned char* jpgdDecompress(jpeg_decoder* decoder)
         }
     }
     return pImage_data;
-}
\ No newline at end of file
+}
-- 
2.7.4


From 9acb636f80a7343ba6a99508101041def327dbb2 Mon Sep 17 00:00:00 2001
From: Hermet Park <chuneon.park@samsung.com>
Date: Mon, 24 Jan 2022 21:21:17 +0900
Subject: [PATCH 07/16] loader png: fix all memory leaks.

These were detected by asan with PicturePng example,

fixed them all.

Change-Id: I4a113656a0b7c06333ced36f9a8ff1d9715d83f9
---
 src/loaders/png/tvgPngLoader.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/loaders/png/tvgPngLoader.cpp b/src/loaders/png/tvgPngLoader.cpp
index 6126ff0..3e29317 100644
--- a/src/loaders/png/tvgPngLoader.cpp
+++ b/src/loaders/png/tvgPngLoader.cpp
@@ -72,6 +72,7 @@ PngLoader::PngLoader()
 PngLoader::~PngLoader()
 {
     if (freeData) free(data);
+    free(image);
 }
 
 
@@ -121,7 +122,7 @@ bool PngLoader::open(const char* data, uint32_t size, bool copy)
     clear();
 
     lodepng_state_init(&state);
-    
+
     unsigned int width, height;
     if (lodepng_inspect(&width, &height, &state, (unsigned char*)(data), size) > 0) return false;
 
@@ -180,10 +181,14 @@ unique_ptr<Surface> PngLoader::bitmap()
 
 void PngLoader::run(unsigned tid)
 {
+    if (image) {
+        free(image);
+        image = nullptr;
+    }
     auto width = static_cast<unsigned>(w);
     auto height = static_cast<unsigned>(h);
 
     lodepng_decode(&image, &width, &height, &state, data, size);
 
     _premultiply((uint32_t*)(image), width, height);
-}
\ No newline at end of file
+}
-- 
2.7.4


From 3726cd4945441b98c92d5f4559dc1ee4e95074ce Mon Sep 17 00:00:00 2001
From: Hermet Park <chuneon.park@samsung.com>
Date: Wed, 26 Jan 2022 17:58:01 +0900
Subject: [PATCH 08/16] examples images: updated sample resources

Change-Id: Ifc2a5502a8b3ffb0843d409196ab839db2f59111
---
 src/examples/images/godot-icon.svg       | 140 +++++++++++++++++++++++++++++++
 src/examples/images/godot-icon.tvg       | Bin 0 -> 2189 bytes
 src/examples/images/samsung-galaxy-s.svg |   1 -
 src/examples/images/samsung-galaxy-s.tvg | Bin 6143 -> 0 bytes
 4 files changed, 140 insertions(+), 1 deletion(-)
 create mode 100644 src/examples/images/godot-icon.svg
 create mode 100644 src/examples/images/godot-icon.tvg
 delete mode 100644 src/examples/images/samsung-galaxy-s.svg
 delete mode 100644 src/examples/images/samsung-galaxy-s.tvg

diff --git a/src/examples/images/godot-icon.svg b/src/examples/images/godot-icon.svg
new file mode 100644
index 0000000..2e72438
--- /dev/null
+++ b/src/examples/images/godot-icon.svg
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1024"
+   height="1024"
+   id="svg3030"
+   version="1.1"
+   inkscape:version="0.92.1 r15371"
+   sodipodi:docname="icon.svg"
+   inkscape:export-filename="/home/akien/Projects/godot/godot.git/icon.png"
+   inkscape:export-xdpi="24"
+   inkscape:export-ydpi="24">
+  <defs
+     id="defs3032" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="707.24666"
+     inkscape:cy="14.063809"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1920"
+     inkscape:window-height="1011"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3035">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-98.519719)">
+    <g
+       id="g78"
+       transform="matrix(4.162611,0,0,-4.162611,919.24059,771.67186)"
+       style="stroke-width:0.32031175">
+      <path
+         d="m 0,0 c 0,0 -0.325,1.994 -0.515,1.976 l -36.182,-3.491 c -2.879,-0.278 -5.115,-2.574 -5.317,-5.459 l -0.994,-14.247 -27.992,-1.997 -1.904,12.912 c -0.424,2.872 -2.932,5.037 -5.835,5.037 h -38.188 c -2.902,0 -5.41,-2.165 -5.834,-5.037 l -1.905,-12.912 -27.992,1.997 -0.994,14.247 c -0.202,2.886 -2.438,5.182 -5.317,5.46 l -36.2,3.49 c -0.187,0.018 -0.324,-1.978 -0.511,-1.978 l -0.049,-7.83 30.658,-4.944 1.004,-14.374 c 0.203,-2.91 2.551,-5.263 5.463,-5.472 l 38.551,-2.75 c 0.146,-0.01 0.29,-0.016 0.434,-0.016 2.897,0 5.401,2.166 5.825,5.038 l 1.959,13.286 h 28.005 l 1.959,-13.286 c 0.423,-2.871 2.93,-5.037 5.831,-5.037 0.142,0 0.284,0.005 0.423,0.015 l 38.556,2.75 c 2.911,0.209 5.26,2.562 5.463,5.472 l 1.003,14.374 30.645,4.966 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.32031175"
+         id="path80"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g82-3"
+       transform="matrix(4.162611,0,0,-4.162611,104.69892,525.90697)"
+       style="stroke-width:0.32031175">
+      <path
+         d="m 0,0 v -47.514 -6.035 -5.492 c 0.108,-0.001 0.216,-0.005 0.323,-0.015 l 36.196,-3.49 c 1.896,-0.183 3.382,-1.709 3.514,-3.609 l 1.116,-15.978 31.574,-2.253 2.175,14.747 c 0.282,1.912 1.922,3.329 3.856,3.329 h 38.188 c 1.933,0 3.573,-1.417 3.855,-3.329 l 2.175,-14.747 31.575,2.253 1.115,15.978 c 0.133,1.9 1.618,3.425 3.514,3.609 l 36.182,3.49 c 0.107,0.01 0.214,0.014 0.322,0.015 v 4.711 l 0.015,0.005 V 0 h 0.134 c 4.795,6.12 9.232,12.569 13.487,19.449 -5.651,9.62 -12.575,18.217 -19.976,26.182 -6.864,-3.455 -13.531,-7.369 -19.828,-11.534 -3.151,3.132 -6.7,5.694 -10.186,8.372 -3.425,2.751 -7.285,4.768 -10.946,7.118 1.09,8.117 1.629,16.108 1.846,24.448 -9.446,4.754 -19.519,7.906 -29.708,10.17 -4.068,-6.837 -7.788,-14.241 -11.028,-21.479 -3.842,0.642 -7.702,0.88 -11.567,0.926 v 0.006 c -0.027,0 -0.052,-0.006 -0.075,-0.006 -0.024,0 -0.049,0.006 -0.073,0.006 V 63.652 C 93.903,63.606 90.046,63.368 86.203,62.726 82.965,69.964 79.247,77.368 75.173,84.205 64.989,81.941 54.915,78.789 45.47,74.035 45.686,65.695 46.225,57.704 47.318,49.587 43.65,47.237 39.795,45.22 36.369,42.469 32.888,39.791 29.333,37.229 26.181,34.097 19.884,38.262 13.219,42.176 6.353,45.631 -1.048,37.666 -7.968,29.069 -13.621,19.449 -9.368,12.569 -4.928,6.12 -0.134,0 Z"
+         style="fill:#478cbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.32031175"
+         id="path84-6"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g86-7"
+       transform="matrix(4.162611,0,0,-4.162611,784.07144,817.24284)"
+       style="stroke-width:0.32031175">
+      <path
+         d="m 0,0 -1.121,-16.063 c -0.135,-1.936 -1.675,-3.477 -3.611,-3.616 l -38.555,-2.751 c -0.094,-0.007 -0.188,-0.01 -0.281,-0.01 -1.916,0 -3.569,1.406 -3.852,3.33 l -2.211,14.994 H -81.09 l -2.211,-14.994 c -0.297,-2.018 -2.101,-3.469 -4.133,-3.32 l -38.555,2.751 c -1.936,0.139 -3.476,1.68 -3.611,3.616 L -130.721,0 -163.268,3.138 c 0.015,-3.498 0.06,-7.33 0.06,-8.093 0,-34.374 43.605,-50.896 97.781,-51.086 h 0.066 0.067 c 54.176,0.19 97.766,16.712 97.766,51.086 0,0.777 0.047,4.593 0.063,8.093 z"
+         style="fill:#478cbf;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.32031175"
+         id="path88-5"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g90-3"
+       transform="matrix(4.162611,0,0,-4.162611,389.21484,625.67104)"
+       style="stroke-width:0.32031175">
+      <path
+         d="m 0,0 c 0,-12.052 -9.765,-21.815 -21.813,-21.815 -12.042,0 -21.81,9.763 -21.81,21.815 0,12.044 9.768,21.802 21.81,21.802 C -9.765,21.802 0,12.044 0,0"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.32031175"
+         id="path92-5"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g94-6"
+       transform="matrix(4.162611,0,0,-4.162611,367.36686,631.05679)"
+       style="stroke-width:0.32031175">
+      <path
+         d="m 0,0 c 0,-7.994 -6.479,-14.473 -14.479,-14.473 -7.996,0 -14.479,6.479 -14.479,14.473 0,7.994 6.483,14.479 14.479,14.479 C -6.479,14.479 0,7.994 0,0"
+         style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.32031175"
+         id="path96-2"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g98-9"
+       transform="matrix(4.162611,0,0,-4.162611,511.99336,724.73954)"
+       style="stroke-width:0.32031175">
+      <path
+         d="m 0,0 c -3.878,0 -7.021,2.858 -7.021,6.381 v 20.081 c 0,3.52 3.143,6.381 7.021,6.381 3.878,0 7.028,-2.861 7.028,-6.381 V 6.381 C 7.028,2.858 3.878,0 0,0"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.32031175"
+         id="path100-1"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g102-2"
+       transform="matrix(4.162611,0,0,-4.162611,634.78706,625.67104)"
+       style="stroke-width:0.32031175">
+      <path
+         d="m 0,0 c 0,-12.052 9.765,-21.815 21.815,-21.815 12.041,0 21.808,9.763 21.808,21.815 0,12.044 -9.767,21.802 -21.808,21.802 C 9.765,21.802 0,12.044 0,0"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.32031175"
+         id="path104-7"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       id="g106-0"
+       transform="matrix(4.162611,0,0,-4.162611,656.64056,631.05679)"
+       style="stroke-width:0.32031175">
+      <path
+         d="m 0,0 c 0,-7.994 6.477,-14.473 14.471,-14.473 8.002,0 14.479,6.479 14.479,14.473 0,7.994 -6.477,14.479 -14.479,14.479 C 6.477,14.479 0,7.994 0,0"
+         style="fill:#414042;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.32031175"
+         id="path108-9"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
+
diff --git a/src/examples/images/godot-icon.tvg b/src/examples/images/godot-icon.tvg
new file mode 100644
index 0000000000000000000000000000000000000000..5290f7e0868df699b9a053ef1e8364e4b8955f6c
GIT binary patch
literal 2189
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
NO}*NC;Kn28e*gkHbx;5R

literal 0
HcmV?d00001

diff --git a/src/examples/images/samsung-galaxy-s.svg b/src/examples/images/samsung-galaxy-s.svg
deleted file mode 100644
index ec5e222..0000000
--- a/src/examples/images/samsung-galaxy-s.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="2500" height="934" viewBox="0 0 247.795 92.551"><path d="M.163 67.794V50.902c0-7.799 3.952-11.276 12.809-11.276 3.396 0 7.688.424 10.432 1.028l.25.053c-.066.588-.327 2.77-.407 3.437a25.959 25.959 0 0 1-.287-.046c-2.565-.411-6.371-.903-9.93-.903-6.696 0-8.956 1.96-8.956 7.769v16.775c0 5.033 1.382 7.763 8.673 7.763 1.785 0 4.766-.188 7.291-.728l.358-.077v-13.42h3.909v16.136a8.504 8.504 0 0 0-.205.059c-3.445 1.003-7.779 1.598-11.582 1.598C3.859 79.067.163 75.695.163 67.794zM65.13 67.794V39.613c.669.007 3.248.038 3.905.044v28.08c0 5.033 1.382 7.763 8.673 7.763h11.079v3.481c-.83.004-11.297.085-11.307.085-8.656.001-12.35-3.371-12.35-11.272zM158.168 40.193h.524c-.857 1.306-12.428 18.872-12.428 18.872s11.963 18.129 12.828 19.436h-4.305c-.264-.396-10.678-16.261-10.678-16.261s-10.408 15.865-10.672 16.261h-4.303c.864-1.307 12.827-19.436 12.827-19.436s-11.569-17.566-12.431-18.872h4.305c.262.397 10.271 15.69 10.271 15.69s10.019-15.293 10.281-15.69h3.781zM191.513 40.193h.451c-.609 1.245-13.033 26.476-13.033 26.476v11.832h-3.908V66.669s-12.424-25.23-13.035-26.476h4.088c.236.498 10.875 22.42 10.875 22.42s10.686-21.924 10.93-22.42h3.632zM57.416 78.5h3.882c-.402-1.153-13.141-37.718-13.344-38.308h-.203-5.128c-.204.59-12.942 37.153-13.347 38.308h3.885c.238-.679 2.325-6.745 4.701-13.657h14.836c2.474 7.171 4.633 13.42 4.718 13.657zM39.085 61.276c3.071-8.936 6.175-17.989 6.175-17.989s3.126 9.058 6.205 17.989h-12.38zM121.687 78.5h3.884l-13.344-38.308h-.199-5.133c-.203.59-12.944 37.153-13.347 38.308h3.887c.24-.679 2.324-6.745 4.702-13.657h14.832c2.474 7.171 4.633 13.42 4.718 13.657zm-18.329-17.224l6.175-17.989s3.126 9.058 6.204 17.989h-12.379z"/><g><path d="M4.292 13.458c-.826-.281-1.496-.663-2.011-1.141a5.507 5.507 0 0 1-1.198-1.564 6.661 6.661 0 0 1-.599-1.818A10.615 10.615 0 0 1 .309 7.04v-.541c0-2.087.586-3.694 1.762-4.815C3.241.563 5.027 0 7.425 0h1.353c1.855 0 3.325.42 4.408 1.258 1.083.837 1.625 2.21 1.625 4.118 0 .386-.104.715-.31.985-.208.27-.568.405-1.083.405-.516 0-.876-.136-1.083-.405-.206-.271-.31-.601-.31-.985 0-.979-.294-1.682-.889-2.107-.592-.426-1.38-.64-2.358-.64H7.425c-1.546 0-2.657.305-3.326.909-.671.605-1.005 1.592-1.005 2.96v.541c0 1.031.18 1.861.541 2.49.361.635.979 1.105 1.855 1.412l5.993 2.128c1.418.518 2.489 1.335 3.21 2.455.722 1.122 1.083 2.496 1.083 4.12v1.312c0 2.091-.588 3.76-1.76 5.011-1.173 1.25-2.958 1.876-5.355 1.876H6.032c-1.855 0-3.326-.42-4.41-1.258-1.081-.836-1.623-2.21-1.623-4.118 0-.388.102-.714.308-.983.207-.272.567-.408 1.083-.408.517 0 .876.136 1.084.408.205.27.31.596.31.983 0 .98.295 1.683.89 2.107.589.425 1.377.64 2.357.64H8.66c1.546 0 2.653-.369 3.325-1.104.67-.734 1.004-1.783 1.004-3.153v-1.312c0-.979-.181-1.806-.541-2.477-.361-.667-.916-1.146-1.663-1.43l-6.493-2.28zM27.569 7.35c1.856 0 3.318.534 4.39 1.605 1.069 1.067 1.604 2.454 1.604 4.154v12.953c0 .388-.104.715-.309.987-.207.271-.567.407-1.082.407h-6.188c-1.854 0-3.318-.407-4.389-1.222-1.071-.809-1.604-2.066-1.604-3.769v-3.133c0-1.698.534-2.958 1.604-3.771 1.071-.811 2.534-1.219 4.389-1.219h4.872v-1.158c0-1.212-.302-2.062-.909-2.551-.605-.49-1.397-.736-2.378-.736h-4.331c-.362 0-.67-.097-.927-.292-.26-.192-.388-.521-.388-.983 0-.466.128-.793.388-.986.257-.193.565-.29.927-.29h4.33v.004zm3.287 17.553V16.9h-4.872c-.98 0-1.773.21-2.378.639-.606.426-.908 1.049-.908 1.875v3.054c0 .771.301 1.373.908 1.798.605.425 1.398.638 2.378.638h4.872zM57.536 14.232c0-1.366-.335-2.43-1.006-3.19-.67-.762-1.777-1.141-3.324-1.141h-2.167V26.45c0 .387-.094.717-.289.987-.193.271-.549.406-1.064.406-.514 0-.869-.136-1.062-.406-.194-.271-.29-.601-.29-.987V9.901h-6.497V26.45c0 .387-.096.717-.292.987-.193.271-.547.406-1.063.406-.516 0-.87-.136-1.063-.406s-.291-.601-.291-.987V8.742c0-.387.098-.716.291-.986.194-.272.548-.405 1.063-.405h12.721c2.397 0 4.169.625 5.317 1.876 1.146 1.248 1.72 2.917 1.72 5.006v12.178c0 .389-.095.719-.289.987-.192.271-.547.406-1.063.406-.515 0-.869-.134-1.064-.406-.19-.269-.289-.599-.289-.987V14.232h.001zM70.566 27.844c-1.701 0-3.048-.357-4.041-1.066-.992-.708-1.488-1.835-1.488-3.382 0-.388.095-.714.288-.987.193-.269.548-.403 1.064-.403s.863.135 1.044.403c.179.273.284.601.309.987.079 1.313 1.021 1.971 2.823 1.971h1.972c.981 0 1.773-.226 2.378-.676.606-.45.909-1.062.909-1.834v-1.625c0-.59-.168-1.075-.503-1.451-.334-.374-.799-.637-1.392-.793l-5.298-1.391c-1.058-.283-1.875-.799-2.456-1.546-.579-.747-.869-1.741-.869-2.979V11.95c0-1.699.534-2.957 1.604-3.769 1.068-.813 2.534-1.219 4.389-1.219h1.003c1.703 0 3.05.355 4.041 1.063.992.71 1.49 1.837 1.49 3.383 0 .387-.096.717-.291.987-.193.271-.546.404-1.062.404-.517 0-.864-.132-1.046-.404a1.966 1.966 0 0 1-.308-.987c-.079-1.314-1.019-1.972-2.825-1.972h-1.003c-.98 0-1.772.228-2.378.675-.605.453-.909 1.065-.909 1.838v1.122c0 .592.174 1.083.522 1.47s.817.656 1.41.811l5.259 1.354c1.084.284 1.907.802 2.476 1.548.566.747.853 1.74.853 2.978v1.625c0 1.701-.536 2.956-1.606 3.771-1.07.811-2.533 1.217-4.389 1.217h-1.97v-.001zM86.032 20.573c0 1.367.335 2.43 1.005 3.188.671.761 1.78 1.142 3.327 1.142h4.407V8.355c0-.387.096-.716.29-.985.194-.271.547-.407 1.065-.407.514 0 .868.136 1.062.407.194.271.292.6.292.985v17.708c0 .388-.099.715-.292.987-.193.271-.548.407-1.062.407h-5.763c-2.397 0-4.17-.626-5.316-1.875-1.147-1.25-1.72-2.923-1.72-5.01V8.392c0-.385.097-.715.29-.984.192-.271.547-.409 1.063-.409.516 0 .869.138 1.063.409.193.27.289.6.289.984v12.181zM114.801 14.232c0-1.366-.334-2.43-1.005-3.19-.672-.762-1.778-1.141-3.324-1.141h-4.409V26.45c0 .387-.096.717-.289.987-.194.271-.55.406-1.063.406-.516 0-.87-.136-1.065-.406-.19-.271-.287-.601-.287-.987V8.742c0-.387.097-.716.287-.986.195-.272.55-.405 1.065-.405h5.762c2.396 0 4.169.625 5.316 1.876 1.146 1.248 1.721 2.917 1.721 5.006v12.178c0 .389-.098.719-.293.987-.19.271-.545.406-1.063.406-.512 0-.869-.134-1.061-.406-.193-.269-.291-.599-.291-.987l-.001-12.179zM136.763 29.657c0 1.085-.146 2.075-.441 2.979a6.551 6.551 0 0 1-1.355 2.358c-.604.671-1.354 1.191-2.242 1.566-.888.372-1.927.561-3.111.561h-3.559c-.359 0-.67-.097-.929-.292-.259-.188-.388-.521-.388-.983 0-.467.129-.792.388-.988.259-.191.569-.291.929-.291h3.559c1.547 0 2.672-.464 3.382-1.391.711-.929 1.065-2.104 1.065-3.521v-2.201h-4.408c-2.396 0-4.172-.626-5.316-1.875-1.148-1.25-1.721-2.923-1.721-5.01v-5.761c0-1.083.147-2.075.444-2.979.298-.9.747-1.688 1.354-2.359a6.241 6.241 0 0 1 2.241-1.564c.89-.375 1.928-.561 3.113-.561h5.646c.516 0 .869.133 1.062.405.194.271.287.6.287.986v20.921zm-6.998-19.756c-1.545 0-2.674.464-3.383 1.392-.707.929-1.062 2.103-1.062 3.52v5.761c0 1.367.336 2.43 1.008 3.188.668.761 1.775 1.142 3.322 1.142h4.408V9.902h-4.293z"/></g><path d="M233.396 58.843c-.178.008-4.399.38-8.977 1.069-3.764.562-5.814.467-7.176.286-2.874-.49-4.814-1.625-5.492-3.444-2.331-6.27 11.164-18.246 30.146-26.749a117.156 117.156 0 0 1 5.897-2.453 142.652 142.652 0 0 0-10.438 3.792c-21.322 8.678-36.612 20.604-34.158 26.641 1.238 3.043 6.752 4.003 14.652 3.102.014-.004.033-.004.047-.004 4.596-.432 10.096-1.572 13.504-1.297 3.32.41 5.563 1.581 6.301 3.564 2.328 6.271-11.168 18.245-30.148 26.751-1.986.891-3.959 1.71-5.896 2.45a142.039 142.039 0 0 0 10.439-3.79c21.32-8.675 36.611-20.604 34.156-26.644-1.139-2.803-5.923-3.84-12.857-3.274z"/></svg>
\ No newline at end of file
diff --git a/src/examples/images/samsung-galaxy-s.tvg b/src/examples/images/samsung-galaxy-s.tvg
deleted file mode 100644
index ac642325e1f0169960299c23d382df2958f0330e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6143
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

-- 
2.7.4


From 412fc993d1ea6be71a424845f4ce3c415f1e7dab Mon Sep 17 00:00:00 2001
From: Mira Grudzinska <m.grudzinska@samsung.com>
Date: Mon, 31 Jan 2022 14:05:58 +0100
Subject: [PATCH 09/16] common: styling++ (tabs -> spaces)

Change-Id: I101d1d536e932924cfb0f70d174d51cddc0ff9e5
---
 src/lib/gl_engine/tvgGlRenderer.cpp  |  4 ++--
 src/lib/gl_engine/tvgGlShaderSrc.cpp | 18 ++++++++--------
 src/lib/sw_engine/tvgSwRasterNeon.h  |  4 ++--
 src/loaders/external_jpg/meson.build |  2 +-
 src/meson.build                      | 40 ++++++++++++++++++------------------
 5 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/lib/gl_engine/tvgGlRenderer.cpp b/src/lib/gl_engine/tvgGlRenderer.cpp
index 6123bf4..4384d52 100644
--- a/src/lib/gl_engine/tvgGlRenderer.cpp
+++ b/src/lib/gl_engine/tvgGlRenderer.cpp
@@ -147,8 +147,8 @@ bool GlRenderer::renderShape(RenderData data)
             const Fill* gradient = sdata->shape->fill();
             if (gradient != nullptr)
             {
-		drawPrimitive(*sdata, gradient, i, RenderUpdateFlag::Gradient);
-	    }
+                drawPrimitive(*sdata, gradient, i, RenderUpdateFlag::Gradient);
+            }
         }
 
         if(flags & (RenderUpdateFlag::Color | RenderUpdateFlag::Transform))
diff --git a/src/lib/gl_engine/tvgGlShaderSrc.cpp b/src/lib/gl_engine/tvgGlShaderSrc.cpp
index ef8d8f9..bba73dc 100644
--- a/src/lib/gl_engine/tvgGlShaderSrc.cpp
+++ b/src/lib/gl_engine/tvgGlShaderSrc.cpp
@@ -26,13 +26,13 @@
 #define TVG_COMPOSE_SHADER(shader) #shader
 
 const char* COLOR_VERT_SHADER = TVG_COMPOSE_SHADER(
-    attribute mediump vec4 aLocation;								\n
-    uniform highp mat4 uTransform;									\n
-    varying highp float vOpacity;									\n
-    void main()														\n
-    {																\n
+    attribute mediump vec4 aLocation;                               \n
+    uniform highp mat4 uTransform;                                  \n
+    varying highp float vOpacity;                                   \n
+    void main()                                                     \n
+    {                                                               \n
         gl_Position = uTransform * vec4(aLocation.xy, 0.0, 1.0);    \n
-        vOpacity = aLocation.z;										\n
+        vOpacity = aLocation.z;                                     \n
     });
 
 const char* COLOR_FRAG_SHADER = TVG_COMPOSE_SHADER(
@@ -47,11 +47,11 @@ const char* GRADIENT_VERT_SHADER = TVG_COMPOSE_SHADER(
 attribute highp vec4 aLocation;                                                 \n
 varying highp float vOpacity;                                                   \n
 varying highp vec2 vPos;                                                        \n
-uniform highp mat4 uTransform;													\n
+uniform highp mat4 uTransform;                                                  \n
                                                                                 \n
 void main()                                                                     \n
 {                                                                               \n
-    gl_Position = uTransform * vec4(aLocation.xy, 0.0, 1.0);					\n
+    gl_Position = uTransform * vec4(aLocation.xy, 0.0, 1.0);                    \n
     vOpacity = aLocation.z;                                                     \n
     vPos = vec2((aLocation.x + 1.0) / 2.0, ((-1.0 * aLocation.y) +1.0) / 2.0);  \n
 });
@@ -62,7 +62,7 @@ precision highp float;
 const int MAX_STOP_COUNT = 4;                                                                           \n
 uniform highp vec2 uSize;                                                                               \n
 uniform highp vec2 uCanvasSize;                                                                         \n
-uniform float nStops;                                                                                  \n
+uniform float nStops;                                                                                   \n
 uniform float noise_level;                                                                              \n
 uniform float stopPoints[MAX_STOP_COUNT];                                                               \n
 uniform vec4 stopColors[MAX_STOP_COUNT];                                                                \n
diff --git a/src/lib/sw_engine/tvgSwRasterNeon.h b/src/lib/sw_engine/tvgSwRasterNeon.h
index 593e4d3..a4b3cda 100644
--- a/src/lib/sw_engine/tvgSwRasterNeon.h
+++ b/src/lib/sw_engine/tvgSwRasterNeon.h
@@ -26,8 +26,8 @@
 
 static inline uint8x8_t ALPHA_BLEND(uint8x8_t c, uint8x8_t a)
 {
-	uint16x8_t t = vmull_u8(c, a);
-	return vshrn_n_u16(t, 8);
+    uint16x8_t t = vmull_u8(c, a);
+    return vshrn_n_u16(t, 8);
 }
 
 
diff --git a/src/loaders/external_jpg/meson.build b/src/loaders/external_jpg/meson.build
index aeecf9f..ce657ba 100644
--- a/src/loaders/external_jpg/meson.build
+++ b/src/loaders/external_jpg/meson.build
@@ -6,7 +6,7 @@ source_file = [
 jpg_dep = dependency('libturbojpeg', required: false)
 
 if not jpg_dep.found()
-	jpg_dep = cc.find_library('turbojpeg', required: false)
+    jpg_dep = cc.find_library('turbojpeg', required: false)
 endif
 
 if jpg_dep.found()
diff --git a/src/meson.build b/src/meson.build
index 8d1a270..26aba33 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -29,38 +29,38 @@ if host_machine.system() != 'windows'
 endif
 
 thorvg_lib = library(
-	'thorvg',
-	include_directories    : headers,
-	version                : meson.project_version(),
-	dependencies           : thorvg_lib_dep,
-	install                : true,
-	cpp_args               : compiler_flags,
-	gnu_symbol_visibility  : 'hidden',
+    'thorvg',
+    include_directories    : headers,
+    version                : meson.project_version(),
+    dependencies           : thorvg_lib_dep,
+    install                : true,
+    cpp_args               : compiler_flags,
+    gnu_symbol_visibility  : 'hidden',
 )
 
 thorvg_dep = declare_dependency(
-	include_directories: headers,
-	link_with : thorvg_lib
+    include_directories: headers,
+    link_with : thorvg_lib
 )
 
 if (cc.get_id() == 'emscripten')
-  subdir('wasm')
+    subdir('wasm')
 
-  executable('thorvg-wasm',
-             [],
-             include_directories : headers,
-             dependencies : [thorvg_lib_dep, thorvg_wasm_dep],
-            )
+    executable('thorvg-wasm',
+        [],
+        include_directories : headers,
+        dependencies : [thorvg_lib_dep, thorvg_wasm_dep],
+        )
 endif
 
 pkg_mod = import('pkgconfig')
 
 pkg_mod.generate(
-	libraries    : thorvg_lib,
-	version      : meson.project_version(),
-	name         : 'libthorvg',
-	filebase     : 'thorvg',
-	description  : 'A Thor library for rendering vector graphics'
+    libraries    : thorvg_lib,
+    version      : meson.project_version(),
+    name         : 'libthorvg',
+    filebase     : 'thorvg',
+    description  : 'A Thor library for rendering vector graphics'
 )
 
 subdir('bin')
-- 
2.7.4


From 249e337e7792490d287e195e33a8cd0653bdee6e Mon Sep 17 00:00:00 2001
From: Michal Maciola <m.maciola@samsung.com>
Date: Fri, 4 Feb 2022 14:50:12 +0100
Subject: [PATCH 10/16] loader png external: fix potential memory leak if read
 fails

Change-Id: I09cc563cbd7144112c5d8f593b3608a9bcdb7e40
---
 src/loaders/external_png/tvgPngLoader.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/loaders/external_png/tvgPngLoader.cpp b/src/loaders/external_png/tvgPngLoader.cpp
index 2991d25..05db65c 100644
--- a/src/loaders/external_png/tvgPngLoader.cpp
+++ b/src/loaders/external_png/tvgPngLoader.cpp
@@ -93,7 +93,10 @@ bool PngLoader::read()
         png_image_free(image);
         return false;
     }
-    if (!png_image_finish_read(image, NULL, buffer, 0, NULL)) return false;
+    if (!png_image_finish_read(image, NULL, buffer, 0, NULL)) {
+        free(buffer);
+        return false;
+    }
     content = reinterpret_cast<uint32_t*>(buffer);
 
     _premultiply(reinterpret_cast<uint32_t*>(buffer), image->width, image->height);
-- 
2.7.4


From 60e17287c1a21a1b91936ed8170b536c26b67cb8 Mon Sep 17 00:00:00 2001
From: jykeon <jykeon@samsung.com>
Date: Mon, 27 Feb 2023 17:40:43 +0900
Subject: [PATCH 11/16] Bump up 0.7.6

Change-Id: I767a52803a91fc74456ea5d25196ffd7a1864882
Signed-off-by: jykeon <jykeon@samsung.com>
---
 packaging/thorvg.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/thorvg.spec b/packaging/thorvg.spec
index a53aa64..295f2a1 100644
--- a/packaging/thorvg.spec
+++ b/packaging/thorvg.spec
@@ -1,6 +1,6 @@
 Name:       thorvg
 Summary:    Thor Vector Graphics Library
-Version:    0.7.5
+Version:    0.7.6
 Release:    1
 Group:      Graphics System/Rendering Engine
 License:    MIT
-- 
2.7.4


From 0a3689cfe19e5b276f80fdfe78a7cedf27eac1e1 Mon Sep 17 00:00:00 2001
From: Mira Grudzinska <m.grudzinska@samsung.com>
Date: Sat, 8 Jan 2022 20:59:50 +0100
Subject: [PATCH 12/16] svg_loader: class attribute added

It's the first step in introducing the css inline style sheets into tvg.
For now the class attribute is set only for SvgNodes (not for grads),
it's not used yet.

Change-Id: Ib81c47b38f5f1355125dc0bff44f07cfbd7c12af
---
 src/loaders/svg/tvgSvgLoader.cpp     | 30 ++++++++++++++++++++++++++++++
 src/loaders/svg/tvgSvgLoaderCommon.h |  1 +
 2 files changed, 31 insertions(+)

diff --git a/src/loaders/svg/tvgSvgLoader.cpp b/src/loaders/svg/tvgSvgLoader.cpp
index 4990c5c..7def62d 100644
--- a/src/loaders/svg/tvgSvgLoader.cpp
+++ b/src/loaders/svg/tvgSvgLoader.cpp
@@ -947,6 +947,15 @@ static void _handleDisplayAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node,
 }
 
 
+static void _handleCssClassAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value)
+{
+    auto cssClass = &node->style->cssClass;
+
+    if (*cssClass && value) free(*cssClass);
+    *cssClass = _copyId(value);
+}
+
+
 typedef void (*styleMethod)(SvgLoaderData* loader, SvgNode* node, const char* value);
 
 #define STYLE_DEF(Name, Name1, Flag) { #Name, sizeof(#Name), _handle##Name1##Attr, Flag }
@@ -1027,6 +1036,8 @@ static bool _attrParseGNode(void* data, const char* key, const char* value)
     } else if (!strcmp(key, "id")) {
         if (node->id && value) free(node->id);
         node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
     } else if (!strcmp(key, "clip-path")) {
         _handleClipPathAttr(loader, node, value);
     } else if (!strcmp(key, "mask")) {
@@ -1054,6 +1065,8 @@ static bool _attrParseClipPathNode(void* data, const char* key, const char* valu
     } else if (!strcmp(key, "id")) {
         if (node->id && value) free(node->id);
         node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
     } else if (!strcmp(key, "clipPathUnits")) {
         if (!strcmp(value, "objectBoundingBox")) clip->userSpace = false;
     } else {
@@ -1076,6 +1089,8 @@ static bool _attrParseMaskNode(void* data, const char* key, const char* value)
     } else if (!strcmp(key, "id")) {
         if (node->id && value) free(node->id);
         node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
     } else if (!strcmp(key, "maskContentUnits")) {
         if (!strcmp(value, "objectBoundingBox")) mask->userSpace = false;
     } else if (!strcmp(key, "mask-type")) {
@@ -1229,6 +1244,8 @@ static bool _attrParsePathNode(void* data, const char* key, const char* value)
     } else if (!strcmp(key, "id")) {
         if (node->id && value) free(node->id);
         node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
     } else {
         return _parseStyleAttr(loader, key, value, false);
     }
@@ -1289,6 +1306,8 @@ static bool _attrParseCircleNode(void* data, const char* key, const char* value)
     } else if (!strcmp(key, "id")) {
         if (node->id && value) free(node->id);
         node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
     } else {
         return _parseStyleAttr(loader, key, value, false);
     }
@@ -1343,6 +1362,8 @@ static bool _attrParseEllipseNode(void* data, const char* key, const char* value
     if (!strcmp(key, "id")) {
         if (node->id && value) free(node->id);
         node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
     } else if (!strcmp(key, "style")) {
         return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
     } else if (!strcmp(key, "clip-path")) {
@@ -1426,6 +1447,8 @@ static bool _attrParsePolygonNode(void* data, const char* key, const char* value
     } else if (!strcmp(key, "id")) {
         if (node->id && value) free(node->id);
         node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
     } else {
         return _parseStyleAttr(loader, key, value, false);
     }
@@ -1500,6 +1523,8 @@ static bool _attrParseRectNode(void* data, const char* key, const char* value)
     if (!strcmp(key, "id")) {
         if (node->id && value) free(node->id);
         node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
     } else if (!strcmp(key, "style")) {
         ret = simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
     } else if (!strcmp(key, "clip-path")) {
@@ -1563,6 +1588,8 @@ static bool _attrParseLineNode(void* data, const char* key, const char* value)
     if (!strcmp(key, "id")) {
         if (node->id && value) free(node->id);
         node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
     } else if (!strcmp(key, "style")) {
         return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
     } else if (!strcmp(key, "clip-path")) {
@@ -1634,6 +1661,8 @@ static bool _attrParseImageNode(void* data, const char* key, const char* value)
     } else if (!strcmp(key, "id")) {
         if (node->id && value) free(node->id);
         node->id = _copyId(value);
+    } else if (!strcmp(key, "class")) {
+        _handleCssClassAttr(loader, node, value);
     } else if (!strcmp(key, "style")) {
         return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
     } else if (!strcmp(key, "clip-path")) {
@@ -2767,6 +2796,7 @@ static void _freeNodeStyle(SvgStyleProperty* style)
     //style->clipPath.node and style->mask.node has only the addresses of node. Therefore, node is released from _freeNode.
     free(style->clipPath.url);
     free(style->mask.url);
+    free(style->cssClass);
 
     if (style->fill.paint.gradient) {
         style->fill.paint.gradient->clear();
diff --git a/src/loaders/svg/tvgSvgLoaderCommon.h b/src/loaders/svg/tvgSvgLoaderCommon.h
index c6685c6..04f5b34 100644
--- a/src/loaders/svg/tvgSvgLoaderCommon.h
+++ b/src/loaders/svg/tvgSvgLoaderCommon.h
@@ -341,6 +341,7 @@ struct SvgStyleProperty
     int opacity;
     SvgColor color;
     bool curColorSet;
+    char* cssClass;
     SvgStyleFlags flags;
 };
 
-- 
2.7.4


From fee0c9f5f34d8a4ee7ab3777b69074aa63b94d0d Mon Sep 17 00:00:00 2001
From: Mira Grudzinska <m.grudzinska@samsung.com>
Date: Sun, 9 Jan 2022 21:31:24 +0100
Subject: [PATCH 13/16] svg_loader: css style node introduced

For now it is assumed that only one style element is defined
in an svg file, although it can be easily changed if needed.
The style node will be used to define the style applied to a node
of a given type or in a case when a class attrib was used.

Change-Id: I53e95dadfbf8a1a48903bc9f07bd2cbec82a4eda
---
 src/loaders/svg/tvgSvgLoader.cpp     | 33 +++++++++++++++++++++++++++++++--
 src/loaders/svg/tvgSvgLoaderCommon.h |  7 +++++++
 2 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/loaders/svg/tvgSvgLoader.cpp b/src/loaders/svg/tvgSvgLoader.cpp
index 7def62d..2a9cba5 100644
--- a/src/loaders/svg/tvgSvgLoader.cpp
+++ b/src/loaders/svg/tvgSvgLoader.cpp
@@ -1102,6 +1102,21 @@ static bool _attrParseMaskNode(void* data, const char* key, const char* value)
 }
 
 
+static bool _attrParseCssStyleNode(void* data, const char* key, const char* value)
+{
+    SvgLoaderData* loader = (SvgLoaderData*)data;
+    SvgNode* node = loader->svgParse->node;
+
+    if (!strcmp(key, "id")) {
+        if (node->id && value) free(node->id);
+        node->id = _copyId(value);
+    } else {
+        return _parseStyleAttr(loader, key, value, false);
+    }
+    return true;
+}
+
+
 static SvgNode* _createNode(SvgNode* parent, SvgNodeType type)
 {
     SvgNode* node = (SvgNode*)calloc(1, sizeof(SvgNode));
@@ -1226,6 +1241,17 @@ static SvgNode* _createClipPathNode(SvgLoaderData* loader, SvgNode* parent, cons
     return loader->svgParse->node;
 }
 
+
+static SvgNode* _createCssStyleNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength)
+{
+    loader->svgParse->node = _createNode(parent, SvgNodeType::CssStyle);
+    if (!loader->svgParse->node) return nullptr;
+
+    simpleXmlParseAttributes(buf, bufLength, _attrParseCssStyleNode, loader);
+    return loader->svgParse->node;
+}
+
+
 static bool _attrParsePathNode(void* data, const char* key, const char* value)
 {
     SvgLoaderData* loader = (SvgLoaderData*)data;
@@ -2096,7 +2122,8 @@ static constexpr struct
     {"g", sizeof("g"), _createGNode},
     {"svg", sizeof("svg"), _createSvgNode},
     {"mask", sizeof("mask"), _createMaskNode},
-    {"clipPath", sizeof("clipPath"), _createClipPathNode}
+    {"clipPath", sizeof("clipPath"), _createClipPathNode},
+    {"style", sizeof("style"), _createCssStyleNode}
 };
 
 
@@ -2526,7 +2553,8 @@ static constexpr struct
     {"svg", sizeof("svg")},
     {"defs", sizeof("defs")},
     {"mask", sizeof("mask")},
-    {"clipPath", sizeof("clipPath")}
+    {"clipPath", sizeof("clipPath")},
+    {"style", sizeof("style")}
 };
 
 
@@ -2585,6 +2613,7 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
             if (loader->stack.count > 0) parent = loader->stack.data[loader->stack.count - 1];
             else parent = loader->doc;
             node = method(loader, parent, attrs, attrsLength);
+            if (!strcmp(tagName, "style")) loader->cssStyle = node;
         }
 
         if (!node) return;
diff --git a/src/loaders/svg/tvgSvgLoaderCommon.h b/src/loaders/svg/tvgSvgLoaderCommon.h
index 04f5b34..41c4184 100644
--- a/src/loaders/svg/tvgSvgLoaderCommon.h
+++ b/src/loaders/svg/tvgSvgLoaderCommon.h
@@ -51,6 +51,7 @@ enum class SvgNodeType
     Video,
     ClipPath,
     Mask,
+    CssStyle,
     Unknown
 };
 
@@ -233,6 +234,10 @@ struct SvgMaskNode
     bool userSpace;
 };
 
+struct SvgCssStyleNode
+{
+};
+
 struct SvgLinearGradient
 {
     float x1;
@@ -368,6 +373,7 @@ struct SvgNode
         SvgImageNode image;
         SvgMaskNode mask;
         SvgClipNode clip;
+        SvgCssStyleNode cssStyle;
     } node;
     bool display;
     ~SvgNode();
@@ -402,6 +408,7 @@ struct SvgLoaderData
     Array<SvgNode *> stack = {nullptr, 0, 0};
     SvgNode* doc = nullptr;
     SvgNode* def = nullptr;
+    SvgNode* cssStyle = nullptr;
     Array<SvgStyleGradient*> gradients;
     SvgStyleGradient* latestGradient = nullptr; //For stops
     SvgParser* svgParse = nullptr;
-- 
2.7.4


From 36f52d998c92c6c982d9bc7208e4cb0fda7459eb Mon Sep 17 00:00:00 2001
From: Mira Grudzinska <m.grudzinska@samsung.com>
Date: Wed, 12 Jan 2022 16:23:22 +0100
Subject: [PATCH 14/16] svg_loader: intro to the implementation of the css
 internal style sheets parsing

Function simpleXmlParseCSSAttribute() used to parse the data inside the style tag.
For now the supported formats are: tag {}, .name {}, tag.name{}

_svgLoaderParserXmlStyle() used to deal with the results of the above - to create
the proper nodes. Will work after create...Node() are changed.

Note:
The geometric attributes are not copied from the node defining the style
to the node using it. The SVG2 standard has to be checked to decide
whether it should be supported.

Change-Id: I0b910bbb88d1142909f997219621c9011ed4e39c
---
 src/loaders/svg/tvgSvgLoader.cpp     | 189 ++++++++++++++++++++++++-----------
 src/loaders/svg/tvgSvgLoaderCommon.h |   1 +
 src/loaders/svg/tvgXmlParser.cpp     |  41 ++++++++
 src/loaders/svg/tvgXmlParser.h       |   7 +-
 4 files changed, 176 insertions(+), 62 deletions(-)

diff --git a/src/loaders/svg/tvgSvgLoader.cpp b/src/loaders/svg/tvgSvgLoader.cpp
index 2a9cba5..274b198 100644
--- a/src/loaders/svg/tvgSvgLoader.cpp
+++ b/src/loaders/svg/tvgSvgLoader.cpp
@@ -80,6 +80,9 @@ typedef SvgNode* (*FactoryMethod)(SvgLoaderData* loader, SvgNode* parent, const
 typedef SvgStyleGradient* (*GradientFactoryMethod)(SvgLoaderData* loader, const char* buf, unsigned bufLength);
 
 
+static void _copyAttr(SvgNode* to, const SvgNode* from, bool copyGeomAttrib = true);
+
+
 static char* _skipSpace(const char* str, const char* end)
 {
     while (((end && str < end) || (!end && *str != '\0')) && isspace(*str)) {
@@ -947,12 +950,32 @@ static void _handleDisplayAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node,
 }
 
 
-static void _handleCssClassAttr(TVG_UNUSED SvgLoaderData* loader, SvgNode* node, const char* value)
+static SvgNode* _findCssStyleNode(const SvgNode* cssStyle, const char* title)
+{
+    if (!cssStyle) return nullptr;
+
+    auto child = cssStyle->child.data;
+    for (uint32_t i = 0; i < cssStyle->child.count; ++i, ++child) {
+        if (((*child)->id) && !strcmp((*child)->id, title)) return (*child);
+    }
+    return nullptr;
+
+
+}
+
+
+static void _handleCssClassAttr(SvgLoaderData* loader, SvgNode* node, const char* value)
 {
     auto cssClass = &node->style->cssClass;
 
     if (*cssClass && value) free(*cssClass);
     *cssClass = _copyId(value);
+
+    //TODO: works only if style was defined before it is used
+    if (auto cssNode = _findCssStyleNode(loader->cssStyle, *cssClass)) {
+        //TODO: check SVG2 stndard - should the geometric properties be copied?
+        _copyAttr(node, cssNode, false);
+    }
 }
 
 
@@ -1908,7 +1931,7 @@ static void _styleCopy(SvgStyleProperty* to, const SvgStyleProperty* from)
 }
 
 
-static void _copyAttr(SvgNode* to, const SvgNode* from)
+static void _copyAttr(SvgNode* to, const SvgNode* from, bool copyGeomAttrib)
 {
     //Copy matrix attribute
     if (from->transform) {
@@ -1923,67 +1946,67 @@ static void _copyAttr(SvgNode* to, const SvgNode* from)
     if (from->style->clipPath.url) to->style->clipPath.url = strdup(from->style->clipPath.url);
     if (from->style->mask.url) to->style->mask.url = strdup(from->style->mask.url);
 
-    //Copy node attribute
-    switch (from->type) {
-        case SvgNodeType::Circle: {
-            to->node.circle.cx = from->node.circle.cx;
-            to->node.circle.cy = from->node.circle.cy;
-            to->node.circle.r = from->node.circle.r;
-            break;
-        }
-        case SvgNodeType::Ellipse: {
-            to->node.ellipse.cx = from->node.ellipse.cx;
-            to->node.ellipse.cy = from->node.ellipse.cy;
-            to->node.ellipse.rx = from->node.ellipse.rx;
-            to->node.ellipse.ry = from->node.ellipse.ry;
-            break;
-        }
-        case SvgNodeType::Rect: {
-            to->node.rect.x = from->node.rect.x;
-            to->node.rect.y = from->node.rect.y;
-            to->node.rect.w = from->node.rect.w;
-            to->node.rect.h = from->node.rect.h;
-            to->node.rect.rx = from->node.rect.rx;
-            to->node.rect.ry = from->node.rect.ry;
-            to->node.rect.hasRx = from->node.rect.hasRx;
-            to->node.rect.hasRy = from->node.rect.hasRy;
-            break;
-        }
-        case SvgNodeType::Line: {
-            to->node.line.x1 = from->node.line.x1;
-            to->node.line.y1 = from->node.line.y1;
-            to->node.line.x2 = from->node.line.x2;
-            to->node.line.y2 = from->node.line.y2;
-            break;
-        }
-        case SvgNodeType::Path: {
-            if (from->node.path.path) to->node.path.path = strdup(from->node.path.path);
-            break;
-        }
-        case SvgNodeType::Polygon: {
-            if ((to->node.polygon.pointsCount = from->node.polygon.pointsCount)) {
+    if (copyGeomAttrib) {
+        //Copy node attribute
+        switch (from->type) {
+            case SvgNodeType::Circle: {
+                to->node.circle.cx = from->node.circle.cx;
+                to->node.circle.cy = from->node.circle.cy;
+                to->node.circle.r = from->node.circle.r;
+                break;
+            }
+            case SvgNodeType::Ellipse: {
+                to->node.ellipse.cx = from->node.ellipse.cx;
+                to->node.ellipse.cy = from->node.ellipse.cy;
+                to->node.ellipse.rx = from->node.ellipse.rx;
+                to->node.ellipse.ry = from->node.ellipse.ry;
+                break;
+            }
+            case SvgNodeType::Rect: {
+                to->node.rect.x = from->node.rect.x;
+                to->node.rect.y = from->node.rect.y;
+                to->node.rect.w = from->node.rect.w;
+                to->node.rect.h = from->node.rect.h;
+                to->node.rect.rx = from->node.rect.rx;
+                to->node.rect.ry = from->node.rect.ry;
+                to->node.rect.hasRx = from->node.rect.hasRx;
+                to->node.rect.hasRy = from->node.rect.hasRy;
+                break;
+            }
+            case SvgNodeType::Line: {
+                to->node.line.x1 = from->node.line.x1;
+                to->node.line.y1 = from->node.line.y1;
+                to->node.line.x2 = from->node.line.x2;
+                to->node.line.y2 = from->node.line.y2;
+                break;
+            }
+            case SvgNodeType::Path: {
+                if (from->node.path.path) to->node.path.path = strdup(from->node.path.path);
+                break;
+            }
+            case SvgNodeType::Polygon: {
+                to->node.polygon.pointsCount = from->node.polygon.pointsCount;
                 to->node.polygon.points = (float*)malloc(to->node.polygon.pointsCount * sizeof(float));
                 memcpy(to->node.polygon.points, from->node.polygon.points, to->node.polygon.pointsCount * sizeof(float));
+                break;
             }
-            break;
-        }
-        case SvgNodeType::Polyline: {
-            if ((to->node.polyline.pointsCount = from->node.polyline.pointsCount)) {
+            case SvgNodeType::Polyline: {
+                to->node.polyline.pointsCount = from->node.polyline.pointsCount;
                 to->node.polyline.points = (float*)malloc(to->node.polyline.pointsCount * sizeof(float));
                 memcpy(to->node.polyline.points, from->node.polyline.points, to->node.polyline.pointsCount * sizeof(float));
+                break;
+            }
+            case SvgNodeType::Image: {
+                to->node.image.x = from->node.image.x;
+                to->node.image.y = from->node.image.y;
+                to->node.image.w = from->node.image.w;
+                to->node.image.h = from->node.image.h;
+                if (from->node.image.href) to->node.image.href = strdup(from->node.image.href);
+                break;
+            }
+            default: {
+                break;
             }
-            break;
-        }
-        case SvgNodeType::Image: {
-            to->node.image.x = from->node.image.x;
-            to->node.image.y = from->node.image.y;
-            to->node.image.w = from->node.image.w;
-            to->node.image.h = from->node.image.h;
-            if (from->node.image.href) to->node.image.href = strdup(from->node.image.href);
-            break;
-        }
-        default: {
-            break;
         }
     }
 }
@@ -2093,6 +2116,7 @@ static SvgNode* _createUseNode(SvgLoaderData* loader, SvgNode* parent, const cha
     return loader->svgParse->node;
 }
 
+
 //TODO: Implement 'text' primitive
 static constexpr struct
 {
@@ -2583,6 +2607,7 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
     GradientFactoryMethod gradientMethod;
     SvgNode *node = nullptr, *parent = nullptr;
     loader->level++;
+    loader->style = false;
     attrs = simpleXmlFindAttributesTag(content, length);
 
     if (!attrs) {
@@ -2613,7 +2638,10 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
             if (loader->stack.count > 0) parent = loader->stack.data[loader->stack.count - 1];
             else parent = loader->doc;
             node = method(loader, parent, attrs, attrsLength);
-            if (!strcmp(tagName, "style")) loader->cssStyle = node;
+            if (!strcmp(tagName, "style")) {
+                loader->cssStyle = node;
+                loader->style = true;
+            }
         }
 
         if (!node) return;
@@ -2654,6 +2682,46 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
 }
 
 
+static void _svgLoaderParserXmlStyle(SvgLoaderData* loader, const char* content, unsigned int length)
+{
+    char* tag;
+    char* name;
+    const char* attrs = nullptr;
+    unsigned int attrsLength = 0;
+
+    FactoryMethod method;
+    GradientFactoryMethod gradientMethod;
+    SvgNode *node = nullptr;
+
+    const char *buf = content;
+    unsigned buflen = length;
+
+
+    while (auto next = simpleXmlParseCSSAttribute(buf, buflen, &tag, &name, &attrs, &attrsLength)) {
+        if ((method = _findGroupFactory(tag))) {
+            //TODO - node->id ??? add additional var for svgnode?
+            if ((node = method(loader, loader->cssStyle, attrs, attrsLength))) node->id = _copyId(name);
+        } else if ((method = _findGraphicsFactory(tag))) {
+            if ((node = method(loader, loader->cssStyle, attrs, attrsLength))) node->id = _copyId(name);
+            //TODO - implement
+        } else if ((gradientMethod = _findGradientFactory(tag))) {
+            //TODO - implement
+            //SvgStyleGradient* gradient = gradientMethod(loader, attrs, attrsLength);
+        } else if (!strcmp(tag, "stop")) {
+            //TODO - implement
+        } else if (!isIgnoreUnsupportedLogElements(tag)) {
+            TVGLOG("SVG", "Unsupported elements used [Elements: %s]", tag);
+        }
+
+        buflen -= next - buf;
+        buf = next;
+
+        free(tag);
+        free(name);
+    }
+}
+
+
 static bool _svgLoaderParser(void* data, SimpleXMLType type, const char* content, unsigned int length)
 {
     SvgLoaderData* loader = (SvgLoaderData*)data;
@@ -2672,7 +2740,10 @@ static bool _svgLoaderParser(void* data, SimpleXMLType type, const char* content
             break;
         }
         case SimpleXMLType::Data:
-        case SimpleXMLType::CData:
+        case SimpleXMLType::CData: {
+            if (loader->style) _svgLoaderParserXmlStyle(loader, content, length);
+            break;
+        }
         case SimpleXMLType::DoctypeChild: {
             break;
         }
diff --git a/src/loaders/svg/tvgSvgLoaderCommon.h b/src/loaders/svg/tvgSvgLoaderCommon.h
index 41c4184..9669660 100644
--- a/src/loaders/svg/tvgSvgLoaderCommon.h
+++ b/src/loaders/svg/tvgSvgLoaderCommon.h
@@ -415,6 +415,7 @@ struct SvgLoaderData
     Array<SvgNodeIdPair> cloneNodes;
     int level = 0;
     bool result = false;
+    bool style = false; //TODO: find a better sollution?
 };
 
 /*
diff --git a/src/loaders/svg/tvgXmlParser.cpp b/src/loaders/svg/tvgXmlParser.cpp
index d182bc2..8381ade 100644
--- a/src/loaders/svg/tvgXmlParser.cpp
+++ b/src/loaders/svg/tvgXmlParser.cpp
@@ -509,6 +509,47 @@ bool simpleXmlParseW3CAttribute(const char* buf, simpleXMLAttributeCb func, cons
 }
 
 
+/*
+ * Supported formats:
+ * tag {}, .name {}, tag.name{}
+ */
+const char* simpleXmlParseCSSAttribute(const char* buf, unsigned bufLength, char** tag, char** name, const char** attrs, unsigned* attrsLength)
+{
+    if (!buf) return nullptr;
+
+    *tag = *name = nullptr;
+    *attrsLength = 0;
+
+    auto itr = _simpleXmlSkipWhiteSpace(buf, buf + bufLength);
+    auto itrEnd = (const char*)memchr(buf, '{', bufLength);
+
+    if (!itrEnd || itr == itrEnd) return nullptr;
+
+    auto nextElement = (const char*)memchr(itrEnd, '}', bufLength - (itrEnd - buf));
+    if (!nextElement) return nullptr;
+
+    *attrs = itrEnd + 1;
+    *attrsLength = nextElement - *attrs;
+
+    const char *p;
+
+    itrEnd = _simpleXmlUnskipWhiteSpace(itrEnd, itr);
+    if (*(itrEnd - 1) == '.') return nullptr;
+
+    for (p = itr; p < itrEnd; p++) {
+        if (*p == '.') break;
+    }
+
+    if (p == itr) *tag = strdup("all");
+    else *tag = strndup(itr, p - itr);
+
+    if (p == itrEnd) *name = nullptr;
+    else *name = strndup(p + 1, itrEnd - p - 1);
+
+    return (nextElement ? nextElement + 1 : nullptr);
+}
+
+
 const char* simpleXmlFindAttributesTag(const char* buf, unsigned bufLength)
 {
     const char *itr = buf, *itrEnd = buf + bufLength;
diff --git a/src/loaders/svg/tvgXmlParser.h b/src/loaders/svg/tvgXmlParser.h
index aa00668..3f703bf 100644
--- a/src/loaders/svg/tvgXmlParser.h
+++ b/src/loaders/svg/tvgXmlParser.h
@@ -32,7 +32,7 @@ const int xmlEntityLength[] = {6, 6, 6, 5, 4, 4, 6, 6};
 enum class SimpleXMLType
 {
     Open = 0,     //!< \<tag attribute="value"\>
-    OpenEmpty,   //!< \<tag attribute="value" /\>
+    OpenEmpty,    //!< \<tag attribute="value" /\>
     Close,        //!< \</tag\>
     Data,         //!< tag text data
     CData,        //!< \<![cdata[something]]\>
@@ -41,7 +41,7 @@ enum class SimpleXMLType
     Doctype,      //!< \<!doctype html
     Comment,      //!< \<!-- something --\>
     Ignored,      //!< whatever is ignored by parser, like whitespace
-    DoctypeChild //!< \<!doctype_child
+    DoctypeChild  //!< \<!doctype_child
 };
 
 typedef bool (*simpleXMLCb)(void* data, SimpleXMLType type, const char* content, unsigned int length);
@@ -50,7 +50,8 @@ typedef bool (*simpleXMLAttributeCb)(void* data, const char* key, const char* va
 bool simpleXmlParseAttributes(const char* buf, unsigned buflen, simpleXMLAttributeCb func, const void* data);
 bool simpleXmlParse(const char* buf, unsigned buflen, bool strip, simpleXMLCb func, const void* data);
 bool simpleXmlParseW3CAttribute(const char* buf, simpleXMLAttributeCb func, const void* data);
-const char *simpleXmlFindAttributesTag(const char* buf, unsigned buflen);
+const char* simpleXmlParseCSSAttribute(const char* buf, unsigned bufLength, char** tag, char** name, const char** attrs, unsigned* attrsLength);
+const char* simpleXmlFindAttributesTag(const char* buf, unsigned buflen);
 bool isIgnoreUnsupportedLogElements(const char* tagName);
 const char* simpleXmlNodeTypeToString(SvgNodeType type);
 
-- 
2.7.4


From cc84597b36d08788234bc9779a6d8fd9680df46a Mon Sep 17 00:00:00 2001
From: Mira Grudzinska <m.grudzinska@samsung.com>
Date: Mon, 17 Jan 2022 19:35:05 +0100
Subject: [PATCH 15/16] svg_loader: additional arg added into create...Node()
 functions

A function pointer added as an additional arg in order to make it
possible to use these functions to create a normal nodes and also
nodes defined inside a style tag. These two cases need to be parsed
using different functions: simpleXmlParseAttributes() and
simpleXmlParseW3CAttribute().

Change-Id: Ic039b5b21172326bea15060195b2cb14153036a4
---
 src/loaders/svg/tvgSvgLoader.cpp | 97 ++++++++++++++++++++--------------------
 src/loaders/svg/tvgXmlParser.cpp |  2 +-
 src/loaders/svg/tvgXmlParser.h   |  2 +-
 3 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/src/loaders/svg/tvgSvgLoader.cpp b/src/loaders/svg/tvgSvgLoader.cpp
index 274b198..e074f20 100644
--- a/src/loaders/svg/tvgSvgLoader.cpp
+++ b/src/loaders/svg/tvgSvgLoader.cpp
@@ -76,7 +76,8 @@
 #define PX_PER_CM 37.79528f //1 in = 2.54 cm -> PX_PER_IN/2.54
 
 
-typedef SvgNode* (*FactoryMethod)(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength);
+typedef bool (*parseAttributes)(const char*, unsigned, simpleXMLAttributeCb, const void*);
+typedef SvgNode* (*FactoryMethod)(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func);
 typedef SvgStyleGradient* (*GradientFactoryMethod)(SvgLoaderData* loader, const char* buf, unsigned bufLength);
 
 
@@ -797,7 +798,7 @@ static bool _attrParseSvgNode(void* data, const char* key, const char* value)
     } else if (!strcmp(key, "preserveAspectRatio")) {
         if (!strcmp(value, "none")) doc->preserveAspect = false;
     } else if (!strcmp(key, "style")) {
-        return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
+        return simpleXmlParseW3CAttribute(value, 0, _parseStyleAttr, loader);
     }
 #ifdef THORVG_LOG_ENABLED
     else if ((!strcmp(key, "x") || !strcmp(key, "y")) && fabsf(svgUtilStrtof(value, nullptr)) > FLT_EPSILON) {
@@ -1053,7 +1054,7 @@ static bool _attrParseGNode(void* data, const char* key, const char* value)
     SvgNode* node = loader->svgParse->node;
 
     if (!strcmp(key, "style")) {
-        return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
+        return simpleXmlParseW3CAttribute(value, 0, _parseStyleAttr, loader);
     } else if (!strcmp(key, "transform")) {
         node->transform = _parseTransformationMatrix(value);
     } else if (!strcmp(key, "id")) {
@@ -1082,7 +1083,7 @@ static bool _attrParseClipPathNode(void* data, const char* key, const char* valu
     SvgClipNode* clip = &(node->node.clip);
 
     if (!strcmp(key, "style")) {
-        return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
+        return simpleXmlParseW3CAttribute(value, 0, _parseStyleAttr, loader);
     } else if (!strcmp(key, "transform")) {
         node->transform = _parseTransformationMatrix(value);
     } else if (!strcmp(key, "id")) {
@@ -1106,7 +1107,7 @@ static bool _attrParseMaskNode(void* data, const char* key, const char* value)
     SvgMaskNode* mask = &(node->node.mask);
 
     if (!strcmp(key, "style")) {
-        return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
+        return simpleXmlParseW3CAttribute(value, 0, _parseStyleAttr, loader);
     } else if (!strcmp(key, "transform")) {
         node->transform = _parseTransformationMatrix(value);
     } else if (!strcmp(key, "id")) {
@@ -1191,7 +1192,7 @@ static SvgNode* _createNode(SvgNode* parent, SvgNodeType type)
 }
 
 
-static SvgNode* _createDefsNode(TVG_UNUSED SvgLoaderData* loader, TVG_UNUSED SvgNode* parent, const char* buf, unsigned bufLength)
+static SvgNode* _createDefsNode(TVG_UNUSED SvgLoaderData* loader, TVG_UNUSED SvgNode* parent, const char* buf, unsigned bufLength, TVG_UNUSED parseAttributes func)
 {
     if (loader->def && loader->doc->node.doc.defs) return loader->def;
     SvgNode* node = _createNode(nullptr, SvgNodeType::Defs);
@@ -1202,17 +1203,17 @@ static SvgNode* _createDefsNode(TVG_UNUSED SvgLoaderData* loader, TVG_UNUSED Svg
 }
 
 
-static SvgNode* _createGNode(TVG_UNUSED SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength)
+static SvgNode* _createGNode(TVG_UNUSED SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::G);
     if (!loader->svgParse->node) return nullptr;
 
-    simpleXmlParseAttributes(buf, bufLength, _attrParseGNode, loader);
+    func(buf, bufLength, _attrParseGNode, loader);
     return loader->svgParse->node;
 }
 
 
-static SvgNode* _createSvgNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength)
+static SvgNode* _createSvgNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::Doc);
     if (!loader->svgParse->node) return nullptr;
@@ -1222,7 +1223,7 @@ static SvgNode* _createSvgNode(SvgLoaderData* loader, SvgNode* parent, const cha
     loader->svgParse->global.h = 0;
 
     doc->preserveAspect = true;
-    simpleXmlParseAttributes(buf, bufLength, _attrParseSvgNode, loader);
+    func(buf, bufLength, _attrParseSvgNode, loader);
 
     if (loader->svgParse->global.w == 0) {
         if (doc->w < FLT_EPSILON) loader->svgParse->global.w = 1;
@@ -1237,7 +1238,7 @@ static SvgNode* _createSvgNode(SvgLoaderData* loader, SvgNode* parent, const cha
 }
 
 
-static SvgNode* _createMaskNode(SvgLoaderData* loader, SvgNode* parent, TVG_UNUSED const char* buf, TVG_UNUSED unsigned bufLength)
+static SvgNode* _createMaskNode(SvgLoaderData* loader, SvgNode* parent, TVG_UNUSED const char* buf, TVG_UNUSED unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::Mask);
     if (!loader->svgParse->node) return nullptr;
@@ -1245,13 +1246,13 @@ static SvgNode* _createMaskNode(SvgLoaderData* loader, SvgNode* parent, TVG_UNUS
     loader->svgParse->node->node.mask.userSpace = true;
     loader->svgParse->node->node.mask.type = SvgMaskType::Luminance;
 
-    simpleXmlParseAttributes(buf, bufLength, _attrParseMaskNode, loader);
+    func(buf, bufLength, _attrParseMaskNode, loader);
 
     return loader->svgParse->node;
 }
 
 
-static SvgNode* _createClipPathNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength)
+static SvgNode* _createClipPathNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::ClipPath);
     if (!loader->svgParse->node) return nullptr;
@@ -1259,18 +1260,18 @@ static SvgNode* _createClipPathNode(SvgLoaderData* loader, SvgNode* parent, cons
     loader->svgParse->node->display = false;
     loader->svgParse->node->node.clip.userSpace = true;
 
-    simpleXmlParseAttributes(buf, bufLength, _attrParseClipPathNode, loader);
+    func(buf, bufLength, _attrParseClipPathNode, loader);
 
     return loader->svgParse->node;
 }
 
 
-static SvgNode* _createCssStyleNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength)
+static SvgNode* _createCssStyleNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::CssStyle);
     if (!loader->svgParse->node) return nullptr;
 
-    simpleXmlParseAttributes(buf, bufLength, _attrParseCssStyleNode, loader);
+    func(buf, bufLength, _attrParseCssStyleNode, loader);
     return loader->svgParse->node;
 }
 
@@ -1285,7 +1286,7 @@ static bool _attrParsePathNode(void* data, const char* key, const char* value)
         //Temporary: need to copy
         path->path = _copyId(value);
     } else if (!strcmp(key, "style")) {
-        return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
+        return simpleXmlParseW3CAttribute(value, 0, _parseStyleAttr, loader);
     } else if (!strcmp(key, "clip-path")) {
         _handleClipPathAttr(loader, node, value);
     } else if (!strcmp(key, "mask")) {
@@ -1302,13 +1303,13 @@ static bool _attrParsePathNode(void* data, const char* key, const char* value)
 }
 
 
-static SvgNode* _createPathNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength)
+static SvgNode* _createPathNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::Path);
 
     if (!loader->svgParse->node) return nullptr;
 
-    simpleXmlParseAttributes(buf, bufLength, _attrParsePathNode, loader);
+    func(buf, bufLength, _attrParsePathNode, loader);
 
     return loader->svgParse->node;
 }
@@ -1347,7 +1348,7 @@ static bool _attrParseCircleNode(void* data, const char* key, const char* value)
     }
 
     if (!strcmp(key, "style")) {
-        return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
+        return simpleXmlParseW3CAttribute(value, 0, _parseStyleAttr, loader);
     } else if (!strcmp(key, "clip-path")) {
         _handleClipPathAttr(loader, node, value);
     } else if (!strcmp(key, "mask")) {
@@ -1364,13 +1365,13 @@ static bool _attrParseCircleNode(void* data, const char* key, const char* value)
 }
 
 
-static SvgNode* _createCircleNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength)
+static SvgNode* _createCircleNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::Circle);
 
     if (!loader->svgParse->node) return nullptr;
 
-    simpleXmlParseAttributes(buf, bufLength, _attrParseCircleNode, loader);
+    func(buf, bufLength, _attrParseCircleNode, loader);
     return loader->svgParse->node;
 }
 
@@ -1414,7 +1415,7 @@ static bool _attrParseEllipseNode(void* data, const char* key, const char* value
     } else if (!strcmp(key, "class")) {
         _handleCssClassAttr(loader, node, value);
     } else if (!strcmp(key, "style")) {
-        return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
+        return simpleXmlParseW3CAttribute(value, 0, _parseStyleAttr, loader);
     } else if (!strcmp(key, "clip-path")) {
         _handleClipPathAttr(loader, node, value);
     } else if (!strcmp(key, "mask")) {
@@ -1426,13 +1427,13 @@ static bool _attrParseEllipseNode(void* data, const char* key, const char* value
 }
 
 
-static SvgNode* _createEllipseNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength)
+static SvgNode* _createEllipseNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::Ellipse);
 
     if (!loader->svgParse->node) return nullptr;
 
-    simpleXmlParseAttributes(buf, bufLength, _attrParseEllipseNode, loader);
+    func(buf, bufLength, _attrParseEllipseNode, loader);
     return loader->svgParse->node;
 }
 
@@ -1488,7 +1489,7 @@ static bool _attrParsePolygonNode(void* data, const char* key, const char* value
     if (!strcmp(key, "points")) {
         return _attrParsePolygonPoints(value, &polygon->points, &polygon->pointsCount);
     } else if (!strcmp(key, "style")) {
-        return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
+        return simpleXmlParseW3CAttribute(value, 0, _parseStyleAttr, loader);
     } else if (!strcmp(key, "clip-path")) {
         _handleClipPathAttr(loader, node, value);
     } else if (!strcmp(key, "mask")) {
@@ -1505,24 +1506,24 @@ static bool _attrParsePolygonNode(void* data, const char* key, const char* value
 }
 
 
-static SvgNode* _createPolygonNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength)
+static SvgNode* _createPolygonNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::Polygon);
 
     if (!loader->svgParse->node) return nullptr;
 
-    simpleXmlParseAttributes(buf, bufLength, _attrParsePolygonNode, loader);
+    func(buf, bufLength, _attrParsePolygonNode, loader);
     return loader->svgParse->node;
 }
 
 
-static SvgNode* _createPolylineNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength)
+static SvgNode* _createPolylineNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::Polyline);
 
     if (!loader->svgParse->node) return nullptr;
 
-    simpleXmlParseAttributes(buf, bufLength, _attrParsePolygonNode, loader);
+    func(buf, bufLength, _attrParsePolygonNode, loader);
     return loader->svgParse->node;
 }
 
@@ -1575,7 +1576,7 @@ static bool _attrParseRectNode(void* data, const char* key, const char* value)
     } else if (!strcmp(key, "class")) {
         _handleCssClassAttr(loader, node, value);
     } else if (!strcmp(key, "style")) {
-        ret = simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
+        ret = simpleXmlParseW3CAttribute(value, 0, _parseStyleAttr, loader);
     } else if (!strcmp(key, "clip-path")) {
         _handleClipPathAttr(loader, node, value);
     } else if (!strcmp(key, "mask")) {
@@ -1588,7 +1589,7 @@ static bool _attrParseRectNode(void* data, const char* key, const char* value)
 }
 
 
-static SvgNode* _createRectNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength)
+static SvgNode* _createRectNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::Rect);
 
@@ -1596,7 +1597,7 @@ static SvgNode* _createRectNode(SvgLoaderData* loader, SvgNode* parent, const ch
 
     loader->svgParse->node->node.rect.hasRx = loader->svgParse->node->node.rect.hasRy = false;
 
-    simpleXmlParseAttributes(buf, bufLength, _attrParseRectNode, loader);
+    func(buf, bufLength, _attrParseRectNode, loader);
     return loader->svgParse->node;
 }
 
@@ -1640,7 +1641,7 @@ static bool _attrParseLineNode(void* data, const char* key, const char* value)
     } else if (!strcmp(key, "class")) {
         _handleCssClassAttr(loader, node, value);
     } else if (!strcmp(key, "style")) {
-        return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
+        return simpleXmlParseW3CAttribute(value, 0, _parseStyleAttr, loader);
     } else if (!strcmp(key, "clip-path")) {
         _handleClipPathAttr(loader, node, value);
     } else if (!strcmp(key, "mask")) {
@@ -1652,13 +1653,13 @@ static bool _attrParseLineNode(void* data, const char* key, const char* value)
 }
 
 
-static SvgNode* _createLineNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength)
+static SvgNode* _createLineNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::Line);
 
     if (!loader->svgParse->node) return nullptr;
 
-    simpleXmlParseAttributes(buf, bufLength, _attrParseLineNode, loader);
+    func(buf, bufLength, _attrParseLineNode, loader);
     return loader->svgParse->node;
 }
 
@@ -1713,7 +1714,7 @@ static bool _attrParseImageNode(void* data, const char* key, const char* value)
     } else if (!strcmp(key, "class")) {
         _handleCssClassAttr(loader, node, value);
     } else if (!strcmp(key, "style")) {
-        return simpleXmlParseW3CAttribute(value, _parseStyleAttr, loader);
+        return simpleXmlParseW3CAttribute(value, 0, _parseStyleAttr, loader);
     } else if (!strcmp(key, "clip-path")) {
         _handleClipPathAttr(loader, node, value);
     } else if (!strcmp(key, "mask")) {
@@ -1725,13 +1726,13 @@ static bool _attrParseImageNode(void* data, const char* key, const char* value)
 }
 
 
-static SvgNode* _createImageNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength)
+static SvgNode* _createImageNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::Image);
 
     if (!loader->svgParse->node) return nullptr;
 
-    simpleXmlParseAttributes(buf, bufLength, _attrParseImageNode, loader);
+    func(buf, bufLength, _attrParseImageNode, loader);
     return loader->svgParse->node;
 }
 
@@ -2106,13 +2107,13 @@ static bool _attrParseUseNode(void* data, const char* key, const char* value)
 }
 
 
-static SvgNode* _createUseNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength)
+static SvgNode* _createUseNode(SvgLoaderData* loader, SvgNode* parent, const char* buf, unsigned bufLength, parseAttributes func)
 {
     loader->svgParse->node = _createNode(parent, SvgNodeType::Use);
 
     if (!loader->svgParse->node) return nullptr;
 
-    simpleXmlParseAttributes(buf, bufLength, _attrParseUseNode, loader);
+    func(buf, bufLength, _attrParseUseNode, loader);
     return loader->svgParse->node;
 }
 
@@ -2389,7 +2390,7 @@ static bool _attrParseStops(void* data, const char* key, const char* value)
             _toColor(value, &stop->r, &stop->g, &stop->b, nullptr);
         }
     } else if (!strcmp(key, "style")) {
-        simpleXmlParseW3CAttribute(value, _attrParseStopsStyle, data);
+        simpleXmlParseW3CAttribute(value, 0, _attrParseStopsStyle, data);
     } else {
         return false;
     }
@@ -2631,13 +2632,13 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
         if (empty) return;
         if (!loader->doc) {
             if (strcmp(tagName, "svg")) return; //Not a valid svg document
-            node = method(loader, nullptr, attrs, attrsLength);
+            node = method(loader, nullptr, attrs, attrsLength, simpleXmlParseAttributes);
             loader->doc = node;
         } else {
             if (!strcmp(tagName, "svg")) return; //Already loaded <svg>(SvgNodeType::Doc) tag
             if (loader->stack.count > 0) parent = loader->stack.data[loader->stack.count - 1];
             else parent = loader->doc;
-            node = method(loader, parent, attrs, attrsLength);
+            node = method(loader, parent, attrs, attrsLength, simpleXmlParseAttributes);
             if (!strcmp(tagName, "style")) {
                 loader->cssStyle = node;
                 loader->style = true;
@@ -2651,7 +2652,7 @@ static void _svgLoaderParserXmlOpen(SvgLoaderData* loader, const char* content,
     } else if ((method = _findGraphicsFactory(tagName))) {
         if (loader->stack.count > 0) parent = loader->stack.data[loader->stack.count - 1];
         else parent = loader->doc;
-        node = method(loader, parent, attrs, attrsLength);
+        node = method(loader, parent, attrs, attrsLength, simpleXmlParseAttributes);
     } else if ((gradientMethod = _findGradientFactory(tagName))) {
         SvgStyleGradient* gradient;
         gradient = gradientMethod(loader, attrs, attrsLength);
@@ -2700,9 +2701,9 @@ static void _svgLoaderParserXmlStyle(SvgLoaderData* loader, const char* content,
     while (auto next = simpleXmlParseCSSAttribute(buf, buflen, &tag, &name, &attrs, &attrsLength)) {
         if ((method = _findGroupFactory(tag))) {
             //TODO - node->id ??? add additional var for svgnode?
-            if ((node = method(loader, loader->cssStyle, attrs, attrsLength))) node->id = _copyId(name);
+            if ((node = method(loader, loader->cssStyle, attrs, attrsLength, simpleXmlParseW3CAttribute))) node->id = _copyId(name);
         } else if ((method = _findGraphicsFactory(tag))) {
-            if ((node = method(loader, loader->cssStyle, attrs, attrsLength))) node->id = _copyId(name);
+            if ((node = method(loader, loader->cssStyle, attrs, attrsLength, simpleXmlParseW3CAttribute))) node->id = _copyId(name);
             //TODO - implement
         } else if ((gradientMethod = _findGradientFactory(tag))) {
             //TODO - implement
@@ -2994,7 +2995,7 @@ static bool _svgLoaderParserForValidCheckXmlOpen(SvgLoaderData* loader, const ch
     if ((method = _findGroupFactory(tagName))) {
         if (!loader->doc) {
             if (strcmp(tagName, "svg")) return true; //Not a valid svg document
-            node = method(loader, nullptr, attrs, attrsLength);
+            node = method(loader, nullptr, attrs, attrsLength, simpleXmlParseAttributes);
             loader->doc = node;
             loader->stack.push(node);
             return false;
diff --git a/src/loaders/svg/tvgXmlParser.cpp b/src/loaders/svg/tvgXmlParser.cpp
index 8381ade..4b54e06 100644
--- a/src/loaders/svg/tvgXmlParser.cpp
+++ b/src/loaders/svg/tvgXmlParser.cpp
@@ -450,7 +450,7 @@ bool simpleXmlParse(const char* buf, unsigned bufLength, bool strip, simpleXMLCb
 }
 
 
-bool simpleXmlParseW3CAttribute(const char* buf, simpleXMLAttributeCb func, const void* data)
+bool simpleXmlParseW3CAttribute(const char* buf, TVG_UNUSED unsigned buflen, simpleXMLAttributeCb func, const void* data)
 {
     const char* end;
     char* key;
diff --git a/src/loaders/svg/tvgXmlParser.h b/src/loaders/svg/tvgXmlParser.h
index 3f703bf..832fb18 100644
--- a/src/loaders/svg/tvgXmlParser.h
+++ b/src/loaders/svg/tvgXmlParser.h
@@ -49,7 +49,7 @@ typedef bool (*simpleXMLAttributeCb)(void* data, const char* key, const char* va
 
 bool simpleXmlParseAttributes(const char* buf, unsigned buflen, simpleXMLAttributeCb func, const void* data);
 bool simpleXmlParse(const char* buf, unsigned buflen, bool strip, simpleXMLCb func, const void* data);
-bool simpleXmlParseW3CAttribute(const char* buf, simpleXMLAttributeCb func, const void* data);
+bool simpleXmlParseW3CAttribute(const char* buf, TVG_UNUSED unsigned buflen, simpleXMLAttributeCb func, const void* data);
 const char* simpleXmlParseCSSAttribute(const char* buf, unsigned bufLength, char** tag, char** name, const char** attrs, unsigned* attrsLength);
 const char* simpleXmlFindAttributesTag(const char* buf, unsigned buflen);
 bool isIgnoreUnsupportedLogElements(const char* tagName);
-- 
2.7.4


From bf89e88b07936b623901dc9bc41c781ec38fbb90 Mon Sep 17 00:00:00 2001
From: Mira Grudzinska <m.grudzinska@samsung.com>
Date: Mon, 17 Jan 2022 22:32:19 +0100
Subject: [PATCH 16/16] svg_loader: additional check while style parsing

This check is needed so the function can be used to parse
not only the inline styles, but also the css internal style sheet.

Change-Id: I6e325d81781326deaccdad8170f11f1acf5f43f2
---
 src/loaders/svg/tvgXmlParser.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/loaders/svg/tvgXmlParser.cpp b/src/loaders/svg/tvgXmlParser.cpp
index 4b54e06..20fd85c 100644
--- a/src/loaders/svg/tvgXmlParser.cpp
+++ b/src/loaders/svg/tvgXmlParser.cpp
@@ -468,6 +468,13 @@ bool simpleXmlParseW3CAttribute(const char* buf, TVG_UNUSED unsigned buflen, sim
     do {
         char* sep = (char*)strchr(buf, ':');
         next = (char*)strchr(buf, ';');
+        if (sep >= end)
+        {
+            next = nullptr;
+            sep = nullptr;
+        }
+        if (next >= end) next = nullptr;
+
 
         key[0] = '\0';
         val[0] = '\0';
-- 
2.7.4