jaehyun pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5c0fc3f2f38d21ebaf4d02226579e4adf2e28aea
commit 5c0fc3f2f38d21ebaf4d02226579e4adf2e28aea
Author: Sungtaek Hong <sth253.h...@samsung.com>
Date: Fri Aug 11 13:50:56 2017 +0900
Cast to double before division during region/coord calculation.
Summary:
int var devided by int is cast to double after devision.
This might cause wrong calculation result.
Reviewers: cedric, jpeg, Jaehyun_Cho
Reviewed By: Jaehyun_Cho
Differential Revision: https://phab.enlightenment.org/D5079
---
src/lib/elementary/elm_map.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/lib/elementary/elm_map.c b/src/lib/elementary/elm_map.c
index b765b41f94..03dd0e0183 100644
--- a/src/lib/elementary/elm_map.c
+++ b/src/lib/elementary/elm_map.c
@@ -461,7 +461,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
@@ -489,7 +489,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
@@ -1120,15 +1120,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;
--
