From f3a2d2a5a61d1723456a8d9b4b25c1d077b997a0 Mon Sep 17 00:00:00 2001 From: Hermet Park Date: Fri, 27 Oct 2023 14:09:53 +0900 Subject: [PATCH] portability: addressed all compilation warnings from MSVC --- src/loaders/lottie/tvgLottieModel.h | 6 +++--- src/renderer/sw_engine/tvgSwMath.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/loaders/lottie/tvgLottieModel.h b/src/loaders/lottie/tvgLottieModel.h index 503560f2..7462f3e6 100644 --- a/src/loaders/lottie/tvgLottieModel.h +++ b/src/loaders/lottie/tvgLottieModel.h @@ -545,15 +545,15 @@ struct LottieComposition return frameCnt() / frameRate; // in second } - int32_t frameAtTime(float timeInSec) const + float frameAtTime(float timeInSec) const { auto p = timeInSec / duration(); if (p < 0.0f) p = 0.0f; else if (p > 1.0f) p = 1.0f; - return (int32_t)lroundf(p * frameCnt()); + return p * frameCnt(); } - uint32_t frameCnt() const + float frameCnt() const { return endFrame - startFrame; } diff --git a/src/renderer/sw_engine/tvgSwMath.cpp b/src/renderer/sw_engine/tvgSwMath.cpp index 428e3e04..d58dd9e3 100644 --- a/src/renderer/sw_engine/tvgSwMath.cpp +++ b/src/renderer/sw_engine/tvgSwMath.cpp @@ -218,7 +218,7 @@ SwFixed mathLength(const SwPoint& pt) than 7% compared to the exact value. */ if (v.x < 0) v.x = -v.x; if (v.y < 0) v.y = -v.y; - return (v.x > v.y) ? (v.x + v.y * 0.375f) : (v.y + v.x * 0.375f); + return static_cast((v.x > v.y) ? (v.x + v.y * 0.375f) : (v.y + v.x * 0.375f)); }