ThorVG: Update source to tip

Author: capnm

thirdparty/thorvg/AUTHORS

@@ -1,10 +1,10 @@
-Hermet Park <[email protected]>
+Hermet Park <[email protected]>, <[email protected]>
 Prudhvi Raj Vasireddi <[email protected]>
 Junsu Choi <[email protected]>
 Pranay Samanta <[email protected]>
 Mateusz Palkowski <[email protected]>
 Subhransu Mohanty <[email protected]>
-Mira Grudzinska <[email protected]>
+Mira Grudzinska <[email protected]>, <[email protected]>
 Michal Szczecinski <[email protected]>
 Shinwoo Kim <[email protected]>
 Piotr Kalota <[email protected]>
@@ -18,10 +18,11 @@ Rémi Verschelde <[email protected]>
 Martin Liska <[email protected]>
 Vincenzo Pupillo <[email protected]>
 EunSik Jeong <[email protected]>
-Samsung Electronics Co., Ltd
 Rafał Mikrut <[email protected]>
 Martin Capitanio <[email protected]>
 RuiwenTang <[email protected]>
 YouJin Lee <[email protected]>
 SergeyLebedkin <[email protected]>
 Jinny You <[email protected]>
+Nattu Adnan <[email protected]>
+Gabor Kiss-Vamosi <[email protected]>

thirdparty/thorvg/inc/thorvg.h

@@ -20,8 +20,8 @@
  * SOFTWARE.
  */
 
-#ifndef _TVG_BINARY_DESC_H_
-#define _TVG_BINARY_DESC_H_
+#ifndef _TVG_FORMAT_H_
+#define _TVG_FORMAT_H_
 
 /* TODO: Need to consider whether uin8_t is enough size for extension...
    Rather than optimal data, we can use enough size and data compress? */
@@ -36,7 +36,7 @@ using TvgBinFlag = TvgBinByte;
 #define TVG_HEADER_SIZE 33                //TVG_HEADER_SIGNATURE_LENGTH + TVG_HEADER_VERSION_LENGTH + 2*SIZE(float) + TVG_HEADER_RESERVED_LENGTH + TVG_HEADER_COMPRESS_SIZE
 #define TVG_HEADER_SIGNATURE "ThorVG"
 #define TVG_HEADER_SIGNATURE_LENGTH 6
-#define TVG_HEADER_VERSION "001200"       //Major 00, Minor 12, Micro 00
+#define TVG_HEADER_VERSION "010000"       //Major 01, Minor 00, Micro 00
 #define TVG_HEADER_VERSION_LENGTH 6
 #define TVG_HEADER_RESERVED_LENGTH 1      //Storing flags for extensions
 #define TVG_HEADER_COMPRESS_SIZE 12       //TVG_HEADER_UNCOMPRESSED_SIZE + TVG_HEADER_COMPRESSED_SIZE + TVG_HEADER_COMPRESSED_SIZE_BITS
@@ -60,11 +60,6 @@ using TvgBinFlag = TvgBinByte;
 #define TVG_TAG_PAINT_CMP_METHOD                    (TvgBinTag)0x20
 
 
-//TODO: Keep this for the compatibility, Remove in TVG 1.0 release
-//Scene
- #define TVG_TAG_SCENE_RESERVEDCNT                   (TvgBinTag)0x30
-
-
 //Shape
 #define TVG_TAG_SHAPE_PATH                          (TvgBinTag)0x40
 #define TVG_TAG_SHAPE_STROKE                        (TvgBinTag)0x41
@@ -97,4 +92,4 @@ using TvgBinFlag = TvgBinByte;
 #define TVG_TAG_PICTURE_RAW_IMAGE                   (TvgBinTag)0x70
 #define TVG_TAG_PICTURE_MESH                        (TvgBinTag)0x71
 
-#endif //_TVG_BINARY_DESC_H_
+#endif //_TVG_FORMAT_H_

thirdparty/thorvg/src/renderer/tvgBinaryDesc.h renamed to thirdparty/thorvg/src/common/tvgFormat.h

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2024 the ThorVG project. All rights reserved.
+
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef _TVG_LOCK_H_
+#define _TVG_LOCK_H_
+
+#ifdef THORVG_THREAD_SUPPORT
+
+#include <mutex>
+
+namespace tvg {
+
+    struct Key
+    {
+        std::mutex mtx;
+    };
+
+    struct ScopedLock
+    {
+        Key* key = nullptr;
+
+        ScopedLock(Key& key)
+        {
+            key.mtx.lock();
+            this->key = &key;
+        }
+
+        ~ScopedLock()
+        {
+            key->mtx.unlock();
+        }
+    };
+
+}
+
+#else //THORVG_THREAD_SUPPORT
+
+namespace tvg {
+
+    struct Key {};
+
+    struct ScopedLock
+    {
+        ScopedLock(Key& key) {}
+    };
+
+}
+
+#endif //THORVG_THREAD_SUPPORT
+
+#endif //_TVG_LOCK_H_

thirdparty/thorvg/src/common/tvgLock.h

@@ -65,7 +65,7 @@ bool PngLoader::open(const string& path)
 }
 
 
-bool PngLoader::open(const char* data, uint32_t size, bool copy)
+bool PngLoader::open(const char* data, uint32_t size, TVG_UNUSED const string& rpath, bool copy)
 {
     image->opaque = NULL;
 

thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.cpp

@@ -33,7 +33,7 @@ class PngLoader : public ImageLoader
     ~PngLoader();
 
     bool open(const string& path) override;
-    bool open(const char* data, uint32_t size, bool copy) override;
+    bool open(const char* data, uint32_t size, const string& rpath, bool copy) override;
     bool read() override;
 
 private:

thirdparty/thorvg/src/loaders/external_png/tvgPngLoader.h

@@ -81,7 +81,7 @@ bool JpgLoader::open(const string& path)
 }
 
 
-bool JpgLoader::open(const char* data, uint32_t size, bool copy)
+bool JpgLoader::open(const char* data, uint32_t size, TVG_UNUSED const string& rpath, bool copy)
 {
     if (copy) {
         this->data = (char *) malloc(size);

thirdparty/thorvg/src/loaders/jpg/tvgJpgLoader.cpp

@@ -42,7 +42,7 @@ class JpgLoader : public ImageLoader, public Task
     ~JpgLoader();
 
     bool open(const string& path) override;
-    bool open(const char* data, uint32_t size, bool copy) override;
+    bool open(const char* data, uint32_t size, const string& rpath, bool copy) override;
     bool read() override;
     bool close() override;
 

thirdparty/thorvg/src/loaders/jpg/tvgJpgLoader.h

@@ -106,7 +106,7 @@ bool PngLoader::open(const string& path)
 }
 
 
-bool PngLoader::open(const char* data, uint32_t size, bool copy)
+bool PngLoader::open(const char* data, uint32_t size, TVG_UNUSED const string& rpath, bool copy)
 {
     unsigned int width, height;
     if (lodepng_inspect(&width, &height, &state, (unsigned char*)(data), size) > 0) return false;

thirdparty/thorvg/src/loaders/png/tvgPngLoader.cpp

@@ -42,7 +42,7 @@ class PngLoader : public ImageLoader, public Task
     ~PngLoader();
 
     bool open(const string& path) override;
-    bool open(const char* data, uint32_t size, bool copy) override;
+    bool open(const char* data, uint32_t size, const string& rpath, bool copy) override;
     bool read() override;
 
     Surface* bitmap() override;