From: joogab yun Date: Thu, 16 Jun 2022 07:25:39 +0000 (+0000) Subject: Merge "It may be outside the range of type int. Change to uint64_t." into devel/master X-Git-Tag: dali_2.1.27~1 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=6971d8bc50e36b3b7d62ad07355b41d3fe41af58;hp=9012617eed6ae42908bbb15363cc9db49af44e2d Merge "It may be outside the range of type int. Change to uint64_t." into devel/master --- diff --git a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp index 2fdf285..71934f0 100644 --- a/dali-toolkit/devel-api/focus-manager/focus-finder.cpp +++ b/dali-toolkit/devel-api/focus-manager/focus-finder.cpp @@ -152,9 +152,9 @@ static int MinorAxisDistance(Dali::Toolkit::Control::KeyboardFocus::Direction di * @param minorAxisDistance The minorAxisDistance * @return The distance */ -static int GetWeightedDistanceFor(int majorAxisDistance, int minorAxisDistance) +static uint64_t GetWeightedDistanceFor(int majorAxisDistance, int minorAxisDistance) { - return 13 * majorAxisDistance * majorAxisDistance + minorAxisDistance * minorAxisDistance; + return 13 * static_cast(majorAxisDistance) * static_cast(majorAxisDistance) + static_cast(minorAxisDistance) * static_cast(minorAxisDistance); } /**