Update trim end to match frameNumber.

Change-Id: I91d40790a2e3b54d8fe51ce78a4fb9358b505235

diff --git a/src/lottie/lottiefiltermodel.h b/src/lottie/lottiefiltermodel.h
index 015e9cb4d1db8ff81e7fd363016d3f77cc4dba1b..21f5e48d18f6e14b833c8b4d807987943bae858c 100644 (file)
--- a/src/lottie/lottiefiltermodel.h
+++ b/src/lottie/lottiefiltermodel.h
@@ -437,7 +437,7 @@ public:
             this->model_->updateTrimStartValue(this->filter()->value(rlottie::Property::TrimStart, frameNo));
         }
         if (this->hasFilter(rlottie::Property::TrimEnd)) {
-            this->model_->updateTrimEndValue(this->filter()->point(rlottie::Property::TrimEnd, frameNo));
+            this->model_->updateTrimEndValue(this->filter()->point(rlottie::Property::TrimEnd, frameNo), frameNo);
         }
         model::Trim::Segment segment = this->model()->segment(frameNo);
         return segment;

diff --git a/src/lottie/lottiemodel.h b/src/lottie/lottiemodel.h
index b8ca1baa5f2e94f7da5f7f7187e7a52c0ffa01d0..c492b720aa3081913c0fdab2d6a433aae8d26b36 100644 (file)
--- a/src/lottie/lottiemodel.h
+++ b/src/lottie/lottiemodel.h
@@ -1015,11 +1015,14 @@ public:
         mStart.value() = start;
     }
 
-    void updateTrimEndValue(VPointF pos)
+    void updateTrimEndValue(VPointF pos, int frameNo)
     {
         for (auto &keyFrame : mEnd.animation().frames_) {
-            keyFrame.value_.start_ = pos.x();
-            keyFrame.value_.end_ = pos.y();
+            if (frameNo >= keyFrame.start_ && frameNo < keyFrame.end_ && pos.x() >=0 && pos.y() >= 0)
+            {
+                keyFrame.value_.start_ = pos.x();
+                keyFrame.value_.end_ = pos.y();
+            }
         }
     }