From: seoz Date: Wed, 21 Sep 2011 10:44:06 +0000 (+0000) Subject: [Upstream merge r63513] elm map: Coding convention. X-Git-Tag: REL_I9200_20111004_1~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=592895e3b92edb41b6137425b8a1d88949f1e911;p=framework%2Fuifw%2Felementary.git [Upstream merge r63513] elm map: Coding convention. git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@63513 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/elm_map.c b/src/lib/elm_map.c index 922a87d..7840078 100644 --- a/src/lib/elm_map.c +++ b/src/lib/elm_map.c @@ -794,6 +794,7 @@ obj_rotate_zoom(void *data, Evas_Object *obj) { ELM_CHECK_WIDTYPE(data, widtype); Widget_Data *wd = elm_widget_data_get(data); + int ow, oh, iw, ih; if ((!wd->pinch.cx) && (!wd->pinch.cy)) { wd->pinch.cx = wd->rotate.cx; @@ -801,10 +802,9 @@ obj_rotate_zoom(void *data, Evas_Object *obj) } evas_map_util_points_populate_from_object_full(wd->map, obj, 0); - int ow, oh, iw, ih; evas_object_image_size_get(obj, &iw, &ih); evas_object_geometry_get(obj, NULL, NULL, &ow, &oh); - if (ow < iw || oh < ih) + if ((ow < iw) || (oh < ih)) { ow *= (double)iw / ow; oh *= (double)ih / oh;