From: Sungtaek Hong Date: Fri, 11 Aug 2017 02:59:34 +0000 (+0900) Subject: Cast to double before division during region/coord calculation. X-Git-Tag: accepted/tizen/4.0/unified/20170828.222329~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dbfa5cb1406f4102473c845c7258cf38c2cb03f6;p=platform%2Fupstream%2Felementary.git Cast to double before division during region/coord calculation. int var devided by int is cast to double after devision. This might cause wrong calculation result. Change-Id: I32128f81cbfa78b1e42b3c03fa18e664e31732ef Signed-off-by: Sungtaek Hong --- diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c index 95e5948..be5b998 100644 --- a/src/lib/elm_map.c +++ b/src/lib/elm_map.c @@ -460,7 +460,7 @@ _coord_to_region_convert(Elm_Map_Data *sd, EINA_SAFETY_ON_NULL_RETURN(sd); - zoom = floor(log(size / sd->size.tile) / log(2)); + zoom = floor(log((double)size / sd->size.tile) / log(2)); if ((sd->src_tile) && (sd->src_tile->coord_to_geo)) { if (sd->src_tile->coord_to_geo @@ -488,7 +488,7 @@ _region_to_coord_convert(Elm_Map_Data *sd, EINA_SAFETY_ON_NULL_RETURN(sd); - zoom = floor(log(size / 256) / log(2)); + zoom = floor(log((double)size / 256) / log(2)); if ((sd->src_tile) && (sd->src_tile->geo_to_coord)) { if (sd->src_tile->geo_to_coord @@ -1119,15 +1119,15 @@ _zoom_do(Elm_Map_Data *sd, double sx, sy; if (vw > ow) sx = 0.5; - else sx = (double)(vx + (double)(vw / 2)) / ow; + else sx = (vx + ((double)vw / 2)) / ow; if (vh > oh) sy = 0.5; - else sy = (double)(vy + (double)(vh / 2)) / oh; + else sy = (vy + ((double)vh / 2)) / oh; if (sx > 1.0) sx = 1.0; if (sy > 1.0) sy = 1.0; - x = ceil((sx * sd->size.w) - (vw / 2)); - y = ceil((sy * sd->size.h) - (vh / 2)); + x = ceil((sx * sd->size.w) - ((double)vw / 2)); + y = ceil((sy * sd->size.h) - ((double)vh / 2)); if (x < 0) x = 0; else if (x > (sd->size.w - vw)) x = sd->size.w - vw;