tvg format: fix broken encoding/decoding.

a regression bug was introduced by 52a7a257b2fb863f1e9e9292de7291b7e2986adf
in size calculation of data in case of uncompressed version.

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

diff --git a/src/loaders/tvg/tvgTvgLoader.cpp b/src/loaders/tvg/tvgTvgLoader.cpp
index 5dfa02b..8916b92 100644 (file)
--- a/src/loaders/tvg/tvgTvgLoader.cpp
+++ b/src/loaders/tvg/tvgTvgLoader.cpp
@@ -210,12 +210,12 @@ void TvgLoader::run(unsigned tid)
 
     if (compressed) {
         data = (char*) lzwDecode((uint8_t*) data, compressedSize, compressedSizeBits, uncompressedSize);
+        root = interpreter->run(data, data + uncompressedSize);
+        delete(data);
+    } else {
+        root = interpreter->run(data, this->data + size);
     }
 
-    root = interpreter->run(data, data + uncompressedSize);
-
-    if (compressed) delete(data);
-
     if (!root) clear();
 }
 

diff --git a/src/savers/tvg/tvgTvgSaver.cpp b/src/savers/tvg/tvgTvgSaver.cpp
index baf079c..473cd44 100644 (file)
--- a/src/savers/tvg/tvgTvgSaver.cpp
+++ b/src/savers/tvg/tvgTvgSaver.cpp
@@ -227,9 +227,11 @@ bool TvgSaver::writeHeader()
 
     //3. View Size
     writeData(vsize, SIZE(vsize));
+    ptr += SIZE(vsize);
 
     //4. Reserved data + Compress size
-    buffer.count += TVG_HEADER_RESERVED_LENGTH + TVG_HEADER_COMPRESS_SIZE;
+    memset(ptr, 0x00, TVG_HEADER_RESERVED_LENGTH + TVG_HEADER_COMPRESS_SIZE);
+    buffer.count += (TVG_HEADER_RESERVED_LENGTH + TVG_HEADER_COMPRESS_SIZE);
 
     return true;
 }