summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-07-09 12:17:46 +0900
committerVitalii Vorobiov <vi.vorobiov@samsung.com>2016-07-21 16:40:50 +0300
commit02539a2eb0f1aff7571875573bbbd3b429766a1c (patch)
tree6f7fab83e84ee3775cf7ec26af6ea8bfa11e401a
parent9cfd7be848f1876e6b3896fa70e468eaf9ff2aa7 (diff)
downloadefl-02539a2eb0f1aff7571875573bbbd3b429766a1c.tar.gz
edje edit - api was broken with incorrect l r t b ordering for border
this fixes ordering to match everywhere else ANd usage of the get func. this was broken already where top/bottom border would swap - plese see coverity scan CID 1355590 for an example of problems this created.
-rw-r--r--src/lib/edje/edje_edit.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 246f511165..c6df12f877 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -9109,7 +9109,7 @@ FUNC_IMAGE_SET_API_SIZE(min);
FUNC_IMAGE_SET_API_SIZE(max);
EAPI Eina_Bool
-edje_edit_image_set_image_border_get(Evas_Object *obj, const char *set_name, unsigned int place, int *l, int *r, int *b, int *t)
+edje_edit_image_set_image_border_get(Evas_Object *obj, const char *set_name, unsigned int place, int *l, int *r, int *t, int *b)
{
Edje_Image_Directory_Set *de = NULL;
Edje_Image_Directory_Set_Entry *dim = NULL;
@@ -9133,14 +9133,14 @@ edje_edit_image_set_image_border_get(Evas_Object *obj, const char *set_name, uns
if (l) *l = dim->border.l;
if (r) *r = dim->border.r;
- if (b) *b = dim->border.b;
if (t) *t = dim->border.t;
+ if (b) *b = dim->border.b;
return EINA_TRUE;
}
EAPI Eina_Bool
-edje_edit_image_set_image_border_set(Evas_Object *obj, const char *set_name, unsigned int place, int l, int r, int b, int t)
+edje_edit_image_set_image_border_set(Evas_Object *obj, const char *set_name, unsigned int place, int l, int r, int t, int b)
{
Edje_Image_Directory_Set *de = NULL;
Edje_Image_Directory_Set_Entry *dim = NULL;
@@ -9164,8 +9164,8 @@ edje_edit_image_set_image_border_set(Evas_Object *obj, const char *set_name, uns
if (l >= 0) dim->border.l = l;
if (r >= 0) dim->border.r = r;
- if (b >= 0) dim->border.b = b;
if (t >= 0) dim->border.t = t;
+ if (b >= 0) dim->border.b = b;
return EINA_TRUE;
}