From ba82ba08a8bfec32f1b69294336f92cc627f79d6 Mon Sep 17 00:00:00 2001 From: Jinny You Date: Sun, 17 Mar 2024 19:29:04 +0900 Subject: [PATCH] lottie: Renamed function names with prefix Fixed naming conflict in short names. issue: #2062 --- src/loaders/lottie/tvgLottieInterpolator.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/loaders/lottie/tvgLottieInterpolator.cpp b/src/loaders/lottie/tvgLottieInterpolator.cpp index 22f1a2dd..19ad502e 100644 --- a/src/loaders/lottie/tvgLottieInterpolator.cpp +++ b/src/loaders/lottie/tvgLottieInterpolator.cpp @@ -40,20 +40,20 @@ #define SUBDIVISION_MAX_ITERATIONS 10 -static inline float _A(float aA1, float aA2) { return 1.0f - 3.0f * aA2 + 3.0f * aA1; } -static inline float _B(float aA1, float aA2) { return 3.0f * aA2 - 6.0f * aA1; } -static inline float _C(float aA1) { return 3.0f * aA1; } +static inline float _constA(float aA1, float aA2) { return 1.0f - 3.0f * aA2 + 3.0f * aA1; } +static inline float _constB(float aA1, float aA2) { return 3.0f * aA2 - 6.0f * aA1; } +static inline float _constC(float aA1) { return 3.0f * aA1; } static inline float _getSlope(float t, float aA1, float aA2) { - return 3.0f * _A(aA1, aA2) * t * t + 2.0f * _B(aA1, aA2) * t + _C(aA1); + return 3.0f * _constA(aA1, aA2) * t * t + 2.0f * _constB(aA1, aA2) * t + _constC(aA1); } static inline float _calcBezier(float t, float aA1, float aA2) { - return ((_A(aA1, aA2) * t + _B(aA1, aA2)) * t + _C(aA1)) * t; + return ((_constA(aA1, aA2) * t + _constB(aA1, aA2)) * t + _constC(aA1)) * t; }