diff --git a/src/loaders/lottie/tvgLottieProperty.h b/src/loaders/lottie/tvgLottieProperty.h index 4b7ebee3..e9671f9f 100644 --- a/src/loaders/lottie/tvgLottieProperty.h +++ b/src/loaders/lottie/tvgLottieProperty.h @@ -319,6 +319,8 @@ float _loop(T* frames, float frameNo, LottieExpression* exp) template struct LottieGenericProperty : LottieProperty { + using MyProperty = LottieGenericProperty; + //Property has an either keyframes or single value. Array* frames = nullptr; Value value; @@ -327,9 +329,9 @@ struct LottieGenericProperty : LottieProperty LottieGenericProperty() : LottieProperty(PType) {} - LottieGenericProperty(const LottieGenericProperty& rhs) + LottieGenericProperty(const MyProperty& rhs) { - copy(const_cast&>(rhs)); + copy(const_cast(rhs)); } ~LottieGenericProperty() @@ -385,7 +387,7 @@ struct LottieGenericProperty : LottieProperty if (exps && exp) { Value out{}; frameNo = _loop(frames, frameNo, exp); - if (exps->result>(frameNo, out, exp)) return out; + if (exps->result(frameNo, out, exp)) return out; } if (!frames) return value; @@ -403,7 +405,7 @@ struct LottieGenericProperty : LottieProperty return tvg::lerp(operator()(frameNo, exps), operator()(tween.frameNo, exps), tween.progress); } - void copy(LottieGenericProperty& rhs, bool shallow = true) + void copy(MyProperty& rhs, bool shallow = true) { if (LottieProperty::copy(&rhs, shallow)) return;