tvg format: code refactoring

use SIZE() macro for consistency.

diff --git a/src/lib/tvgBinaryDesc.h b/src/lib/tvgBinaryDesc.h
index 793d48f..218553e 100644 (file)
--- a/src/lib/tvgBinaryDesc.h
+++ b/src/lib/tvgBinaryDesc.h
@@ -34,6 +34,7 @@ using TvgBinTag = TvgBinByte;
 using TvgBinFlag = TvgBinByte;
 
 
+
 //Header
 #define TVG_HEADER_SIGNATURE "ThorVG"
 #define TVG_HEADER_SIGNATURE_LENGTH 6

diff --git a/src/loaders/tvg/tvgTvgLoadParser.cpp b/src/loaders/tvg/tvgTvgLoadParser.cpp
index 6636472..59f539a 100644 (file)
--- a/src/loaders/tvg/tvgTvgLoadParser.cpp
+++ b/src/loaders/tvg/tvgTvgLoadParser.cpp
@@ -42,6 +42,7 @@ struct TvgBinBlock
 #define _read_tvg_ui32(dst, src) memcpy(dst, (src), sizeof(uint32_t))
 #define _read_tvg_float(dst, src) memcpy(dst, (src), sizeof(float))
 
+
 static Paint* _parsePaint(TvgBinBlock block);
 
 static bool _paintProperty(TvgBinBlock block)
@@ -80,11 +81,11 @@ static bool _readTvgHeader(const char **ptr, float* w, float* h)
 
     //View width
     if (w) _read_tvg_float(w, *ptr);
-    *ptr += sizeof(float);
+    *ptr += SIZE(float);
 
     //View height
     if (h) _read_tvg_float(h, *ptr);
-    *ptr += sizeof(float);
+    *ptr += SIZE(float);
 
     return true;
 }
@@ -96,7 +97,7 @@ static bool _parseCmpTarget(const char *ptr, const char *end, Paint *paint)
     if (block.end > end) return false;
 
     if (block.type != TVG_TAG_PAINT_CMP_METHOD) return false;
-    if (block.length != sizeof(TvgBinFlag)) return false;
+    if (block.length != SIZE(TvgBinFlag)) return false;
 
     CompositeMethod cmpMethod;
 
@@ -131,14 +132,14 @@ static bool _parsePaintProperty(TvgBinBlock block, Paint *paint)
 {
     switch (block.type) {
         case TVG_TAG_PAINT_OPACITY: {
-            if (block.length != sizeof(uint8_t)) return false;
+            if (block.length != SIZE(uint8_t)) return false;
             paint->opacity(*block.data);
             return true;
         }
         case TVG_TAG_PAINT_TRANSFORM: {
-            if (block.length != sizeof(Matrix)) return false;
+            if (block.length != SIZE(Matrix)) return false;
             Matrix matrix;
-            memcpy(&matrix, block.data, sizeof(Matrix));
+            memcpy(&matrix, block.data, SIZE(Matrix));
             if (paint->transform(matrix) != Result::Success) return false;
             return true;
         }
@@ -157,7 +158,7 @@ static bool _parseScene(TvgBinBlock block, Paint *paint)
 
     switch (block.type) {
         case TVG_FLAG_SCENE_RESERVEDCNT: {
-            if (block.length != sizeof(uint32_t)) return false;
+            if (block.length != SIZE(uint32_t)) return false;
             uint32_t reservedCnt;
             _read_tvg_ui32(&reservedCnt, block.data);
             scene->reserve(reservedCnt);
@@ -181,14 +182,14 @@ static bool _parseShapePath(const char *ptr, const char *end, Shape *shape)
     //Shape Path
     uint32_t cmdCnt, ptsCnt;
     _read_tvg_ui32(&cmdCnt, ptr);
-    ptr += sizeof(uint32_t);
+    ptr += SIZE(uint32_t);
     _read_tvg_ui32(&ptsCnt, ptr);
-    ptr += sizeof(uint32_t);
+    ptr += SIZE(uint32_t);
 
     const PathCommand* cmds = (PathCommand*) ptr;
-    ptr += sizeof(PathCommand) * cmdCnt;
+    ptr += SIZE(PathCommand) * cmdCnt;
     const Point* pts = (Point*) ptr;
-    ptr += sizeof(Point) * ptsCnt;
+    ptr += SIZE(Point) * ptsCnt;
 
     if (ptr > end) return false;
 
@@ -207,15 +208,15 @@ static bool _parseShapeFill(const char *ptr, const char *end, Fill **fillOutside
 
         switch (block.type) {
             case TVG_TAG_FILL_RADIAL_GRADIENT: {
-                if (block.length != 3 * sizeof(float)) return false;
+                if (block.length != 3 * SIZE(float)) return false;
 
                 auto ptr = block.data;
                 float x, y, radius;
 
                 _read_tvg_float(&x, ptr);
-                ptr += sizeof(float);
+                ptr += SIZE(float);
                 _read_tvg_float(&y, ptr);
-                ptr += sizeof(float);
+                ptr += SIZE(float);
                 _read_tvg_float(&radius, ptr);
 
                 auto fillGradRadial = RadialGradient::gen();
@@ -224,17 +225,17 @@ static bool _parseShapeFill(const char *ptr, const char *end, Fill **fillOutside
                 break;
             }
             case TVG_TAG_FILL_LINEAR_GRADIENT: {
-                if (block.length != 4 * sizeof(float)) return false;
+                if (block.length != 4 * SIZE(float)) return false;
 
                 auto ptr = block.data;
                 float x1, y1, x2, y2;
 
                 _read_tvg_float(&x1, ptr);
-                ptr += sizeof(float);
+                ptr += SIZE(float);
                 _read_tvg_float(&y1, ptr);
-                ptr += sizeof(float);
+                ptr += SIZE(float);
                 _read_tvg_float(&x2, ptr);
-                ptr += sizeof(float);
+                ptr += SIZE(float);
                 _read_tvg_float(&y2, ptr);
 
                 auto fillGradLinear = LinearGradient::gen();
@@ -244,7 +245,7 @@ static bool _parseShapeFill(const char *ptr, const char *end, Fill **fillOutside
             }
             case TVG_TAG_FILL_FILLSPREAD: {
                 if (!fillGrad) return false;
-                if (block.length != sizeof(TvgBinFlag)) return false;
+                if (block.length != SIZE(TvgBinFlag)) return false;
                 switch (*block.data) {
                     case TVG_FLAG_FILL_FILLSPREAD_PAD: {
                         fillGrad->spread(FillSpread::Pad);
@@ -290,9 +291,9 @@ static bool _parseShapeStrokeDashPattern(const char *ptr, const char *end, Shape
 {
     uint32_t dashPatternCnt;
     _read_tvg_ui32(&dashPatternCnt, ptr);
-    ptr += sizeof(uint32_t);
+    ptr += SIZE(uint32_t);
     const float* dashPattern = (float*) ptr;
-    ptr += sizeof(float) * dashPatternCnt;
+    ptr += SIZE(float) * dashPatternCnt;
 
     if (ptr > end) return false;
 
@@ -309,7 +310,7 @@ static bool _parseShapeStroke(const char *ptr, const char *end, Shape *shape)
 
         switch (block.type) {
             case TVG_TAG_SHAPE_STROKE_CAP: {
-                if (block.length != sizeof(TvgBinFlag)) return false;
+                if (block.length != SIZE(TvgBinFlag)) return false;
                 switch (*block.data) {
                     case TVG_FLAG_SHAPE_STROKE_CAP_SQUARE:
                         shape->stroke(StrokeCap::Square);
@@ -324,7 +325,7 @@ static bool _parseShapeStroke(const char *ptr, const char *end, Shape *shape)
                 break;
             }
             case TVG_TAG_SHAPE_STROKE_JOIN: {
-                if (block.length != sizeof(TvgBinFlag)) return false;
+                if (block.length != SIZE(TvgBinFlag)) return false;
                 switch (*block.data) {
                     case TVG_FLAG_SHAPE_STROKE_JOIN_BEVEL:
                         shape->stroke(StrokeJoin::Bevel);
@@ -339,7 +340,7 @@ static bool _parseShapeStroke(const char *ptr, const char *end, Shape *shape)
                 break;
             }
             case TVG_TAG_SHAPE_STROKE_WIDTH: {
-                if (block.length != sizeof(float)) return false;
+                if (block.length != SIZE(float)) return false;
                 float width;
                 _read_tvg_float(&width, block.data);
                 shape->stroke(width);
@@ -392,7 +393,7 @@ static bool _parseShape(TvgBinBlock block, Paint* paint)
             break;
         }
         case TVG_TAG_SHAPE_FILLRULE: {
-            if (block.length != sizeof(TvgBinFlag)) return false;
+            if (block.length != SIZE(TvgBinFlag)) return false;
             switch (*block.data) {
                 case TVG_FLAG_SHAPE_FILLRULE_WINDING:
                     shape->fill(FillRule::Winding);
@@ -415,18 +416,18 @@ static bool _parsePicture(TvgBinBlock block, Paint* paint)
 
     switch (block.type) {
         case TVG_TAG_PICTURE_RAW_IMAGE: {
-            if (block.length < 2 * sizeof(uint32_t)) return false;
+            if (block.length < 2 * SIZE(uint32_t)) return false;
 
             auto ptr = block.data;
             uint32_t w, h;
 
             _read_tvg_ui32(&w, ptr);
-            ptr += sizeof(uint32_t);
+            ptr += SIZE(uint32_t);
             _read_tvg_ui32(&h, ptr);
-            ptr += sizeof(uint32_t);
+            ptr += SIZE(uint32_t);
 
-            auto size = w * h * sizeof(uint32_t);
-            if (block.length != 2 * sizeof(uint32_t) + size) return false;
+            auto size = w * h * SIZE(uint32_t);
+            if (block.length != 2 * SIZE(uint32_t) + size) return false;
 
             picture->load((uint32_t*) ptr, w, h, true);
             return true;

diff --git a/src/savers/tvg/tvgTvgSaver.cpp b/src/savers/tvg/tvgTvgSaver.cpp
index d7c3855..7620d58 100644 (file)
--- a/src/savers/tvg/tvgTvgSaver.cpp
+++ b/src/savers/tvg/tvgTvgSaver.cpp
@@ -21,7 +21,6 @@
  */
 #include <float.h>
 #include <math.h>
-#include <stdio.h>
 #include "tvgSaveModule.h"
 #include "tvgTvgSaver.h"