rlottie: Get size data from the model

diff --git a/src/lottie/lottieanimation.cpp b/src/lottie/lottieanimation.cpp
index 7b11f4f..2ff5dc4 100644 (file)
--- a/src/lottie/lottieanimation.cpp
+++ b/src/lottie/lottieanimation.cpp
@@ -39,7 +39,7 @@ class AnimationImpl {
 public:
     void    init(const std::shared_ptr<LOTModel> &model);
     bool    update(size_t frameNo, const VSize &size);
-    VSize   size() const { return mCompItem->size(); }
+    VSize   size() const { return mModel->size(); }
     double  duration() const { return mModel->duration(); }
     double  frameRate() const { return mModel->frameRate(); }
     size_t  totalFrame() const { return mModel->totalFrame(); }

diff --git a/src/lottie/lottieitem.cpp b/src/lottie/lottieitem.cpp
index 14ff732..f074184 100644 (file)
--- a/src/lottie/lottieitem.cpp
+++ b/src/lottie/lottieitem.cpp
@@ -116,11 +116,6 @@ void LOTCompItem::resize(const VSize &size)
     mUpdateViewBox = true;
 }
 
-VSize LOTCompItem::size() const
-{
-    return mViewSize;
-}
-
 bool LOTCompItem::update(int frameNo)
 {
     // check if cached frame is same as requested frame.

diff --git a/src/lottie/lottieitem.h b/src/lottie/lottieitem.h
index 407994d..a363f47 100644 (file)
--- a/src/lottie/lottieitem.h
+++ b/src/lottie/lottieitem.h
@@ -67,7 +67,7 @@ public:
    static std::unique_ptr<LOTLayerItem> createLayerItem(LOTLayerData *layerData);
    bool update(int frameNo);
    void resize(const VSize &size);
-   VSize size() const;
+   VSize size() const { return mViewSize;}
    void buildRenderTree();
    const LOTLayerNode * renderTree()const;
    bool render(const rlottie::Surface &surface);

diff --git a/src/lottie/lottiemodel.h b/src/lottie/lottiemodel.h
index 2284d25..0251174 100644 (file)
--- a/src/lottie/lottiemodel.h
+++ b/src/lottie/lottiemodel.h
@@ -955,6 +955,7 @@ class LOTModel
 {
 public:
    bool  isStatic() const {return mRoot->isStatic();}
+   VSize size() const {return mRoot->size();}
    double duration() const {return mRoot->duration();}
    size_t totalFrame() const {return mRoot->totalFrame();}
    size_t frameDuration() const {return mRoot->frameDuration();}