From bbf3cec2cc040f879a971b56c9f7b5a631e10a98 Mon Sep 17 00:00:00 2001
From: Hermet Park <hermet@lottiefiles.com>
Date: Tue, 12 Dec 2023 21:05:08 +0900
Subject: [PATCH] common/array: code refactoring.

Use a default constructor with reservation.
---
 src/common/tvgArray.h                    | 5 +++++
 src/loaders/lottie/tvgLottieBuilder.cpp  | 3 +--
 src/loaders/lottie/tvgLottieModel.h      | 5 +----
 src/loaders/lottie/tvgLottieParser.cpp   | 3 +--
 src/renderer/gl_engine/tvgGlRenderer.cpp | 6 ++----
 src/renderer/tvgScene.h                  | 3 +--
 src/savers/tvg/tvgTvgSaver.cpp           | 3 +--
 7 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/common/tvgArray.h b/src/common/tvgArray.h
index 08eb2532..3542b2ea 100644
--- a/src/common/tvgArray.h
+++ b/src/common/tvgArray.h
@@ -38,6 +38,11 @@ struct Array
 
     Array(){}
 
+    Array(int32_t size)
+    {
+        reserve(size);
+    }
+
     Array(const Array& rhs)
     {
         reset();
diff --git a/src/loaders/lottie/tvgLottieBuilder.cpp b/src/loaders/lottie/tvgLottieBuilder.cpp
index 7013cf51..d7eff3b9 100644
--- a/src/loaders/lottie/tvgLottieBuilder.cpp
+++ b/src/loaders/lottie/tvgLottieBuilder.cpp
@@ -329,8 +329,7 @@ static void _repeat(LottieGroup* parent, unique_ptr<Shape> path, RenderContext*
 {
     auto repeater = ctx->repeater;
 
-    Array<Shape*> shapes;
-    shapes.reserve(repeater->cnt);
+    Array<Shape*> shapes(repeater->cnt);
 
     for (int i = 0; i < repeater->cnt; ++i) {
         auto multiplier = repeater->offset + static_cast<float>(i);
diff --git a/src/loaders/lottie/tvgLottieModel.h b/src/loaders/lottie/tvgLottieModel.h
index 68263c4a..f8bde603 100644
--- a/src/loaders/lottie/tvgLottieModel.h
+++ b/src/loaders/lottie/tvgLottieModel.h
@@ -85,13 +85,10 @@ struct LottieGradient
     uint32_t populate(ColorStop& color)
     {
         uint32_t alphaCnt = (color.input->count - (colorStops.count * 4)) / 2;
-        Array<Fill::ColorStop> output;
-        output.reserve(colorStops.count + alphaCnt);
-
+        Array<Fill::ColorStop> output(colorStops.count + alphaCnt);
         uint32_t cidx = 0;               //color count
         uint32_t clast = colorStops.count * 4;
         uint32_t aidx = clast;           //alpha count
-
         Fill::ColorStop cs;
 
         //merge color stops.
diff --git a/src/loaders/lottie/tvgLottieParser.cpp b/src/loaders/lottie/tvgLottieParser.cpp
index 5cef208e..cb159324 100644
--- a/src/loaders/lottie/tvgLottieParser.cpp
+++ b/src/loaders/lottie/tvgLottieParser.cpp
@@ -237,8 +237,7 @@ void LottieParser::getValue(ColorStop& color)
 {
     if (peekType() == kArrayType) enterArray();
 
-    color.input = new Array<float>;
-    color.input->reserve(context->gradient->colorStops.count);
+    color.input = new Array<float>(context->gradient->colorStops.count);
 
     while (nextArrayValue()) color.input->push(getFloat());
 }
diff --git a/src/renderer/gl_engine/tvgGlRenderer.cpp b/src/renderer/gl_engine/tvgGlRenderer.cpp
index 85d2f6bd..7be4e0f2 100644
--- a/src/renderer/gl_engine/tvgGlRenderer.cpp
+++ b/src/renderer/gl_engine/tvgGlRenderer.cpp
@@ -621,8 +621,7 @@ GlRenderPass* GlRenderer::currentPass()
 void GlRenderer::prepareCmpTask(GlRenderTask* task, float opacity)
 {
     // we use 1:1 blit mapping since compositor fbo is same size as root fbo
-    Array<float> vertices;
-    vertices.reserve(5 * 4);
+    Array<float> vertices(5 * 4);
 
     float left = -1.f;
     float top = 1.f;
@@ -654,8 +653,7 @@ void GlRenderer::prepareCmpTask(GlRenderTask* task, float opacity)
     vertices.push(1.f);
     vertices.push(0.f);
 
-    Array<uint32_t> indices;
-    indices.reserve(6);
+    Array<uint32_t> indices(6);
 
     indices.push(0);
     indices.push(1);
diff --git a/src/renderer/tvgScene.h b/src/renderer/tvgScene.h
index 8ae2055e..518571e6 100644
--- a/src/renderer/tvgScene.h
+++ b/src/renderer/tvgScene.h
@@ -123,8 +123,7 @@ struct Scene::Impl
         this->renderer = &renderer;
 
         if (clipper) {
-            Array<RenderData> rds;
-            rds.reserve(paints.size());
+            Array<RenderData> rds(paints.size());
             for (auto paint : paints) {
                 rds.push(paint->pImpl->update(renderer, transform, clips, opacity, flag, true));
             }
diff --git a/src/savers/tvg/tvgTvgSaver.cpp b/src/savers/tvg/tvgTvgSaver.cpp
index cea144ec..7af71010 100644
--- a/src/savers/tvg/tvgTvgSaver.cpp
+++ b/src/savers/tvg/tvgTvgSaver.cpp
@@ -685,8 +685,7 @@ TvgBinCounter TvgSaver::serializeChildren(Iterator* it, const Matrix* pTransform
     TvgBinCounter cnt = 0;
 
     //Merging shapes. the result is written in the children.
-    Array<const Paint*> children;
-    children.reserve(it->count());
+    Array<const Paint*> children(it->count());
     children.push(it->next());
 
     while (auto child = it->next()) {