projects
/
framework
/
uifw
/
elementary.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
99c161c
)
[Upstream merge r63513] elm map: Coding convention.
author
seoz
<seoz@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Wed, 21 Sep 2011 10:44:06 +0000
(10:44 +0000)
committer
Daniel Juyung Seo
<juyung.seo@samsung.com>
Tue, 27 Sep 2011 08:02:05 +0000
(17:02 +0900)
git-svn-id: https://svn.enlightenment.org/svn/e/trunk/elementary@63513
7cbeb6ba
-43b4-40fd-8cce-
4c39aea84d33
src/lib/elm_map.c
patch
|
blob
|
history
diff --git
a/src/lib/elm_map.c
b/src/lib/elm_map.c
index
922a87d
..
7840078
100644
(file)
--- 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;