summaryrefslogtreecommitdiff
path: root/src/lib/edje
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2017-01-06 09:57:46 -0800
committerCedric BAIL <cedric@osg.samsung.com>2017-01-06 15:58:46 -0800
commit8f1c071d6adbf6f8e2002eeeabdc7f3d7be9ef22 (patch)
tree17bddaa85bcdead8807053b009d1adf1c9eda71c /src/lib/edje
parentf9928b75c8c4a2e6c3f02aafb68c8a569a47ab04 (diff)
eina: rename EINA_{FLT,DBL}_CMP to EINA_{FLT,DBL}_EQ.
Diffstat (limited to 'src/lib/edje')
-rw-r--r--src/lib/edje/edje_load.c4
-rw-r--r--src/lib/edje/edje_private.h4
-rw-r--r--src/lib/edje/edje_program.c4
-rw-r--r--src/lib/edje/edje_textblock_styles.c2
-rw-r--r--src/lib/edje/edje_util.c2
5 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index bdbf698ca7..01030e30db 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -2945,8 +2945,8 @@ _edje_dupe_vector_data(Edje *ed, int svg_id, double width, double height,
2945 root = evas_vg_container_add(NULL); 2945 root = evas_vg_container_add(NULL);
2946 efl_vg_dup(root, vector->vg); 2946 efl_vg_dup(root, vector->vg);
2947 2947
2948 if (!EINA_DBL_CMP(vector->w, 0) && 2948 if (!EINA_DBL_EQ(vector->w, 0) &&
2949 !EINA_DBL_CMP(vector->h, 0)) 2949 !EINA_DBL_EQ(vector->h, 0))
2950 { 2950 {
2951 _apply_transformation(root, width, height, vector); 2951 _apply_transformation(root, width, height, vector);
2952 } 2952 }
diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h
index 13dc7961dd..b100365c25 100644
--- a/src/lib/edje/edje_private.h
+++ b/src/lib/edje/edje_private.h
@@ -176,8 +176,8 @@ EAPI extern int _edje_default_log_dom ;
176#define COS(a) cos(a) 176#define COS(a) cos(a)
177#define SIN(a) sin(a) 177#define SIN(a) sin(a)
178#define PI 3.14159265358979323846 178#define PI 3.14159265358979323846
179#define EQ(a, b) EINA_DBL_CMP(a, b) 179#define EQ(a, b) EINA_DBL_EQ(a, b)
180#define NEQ(a, b) !EINA_DBL_CMP(a, b) 180#define NEQ(a, b) !EINA_DBL_EQ(a, b)
181 181
182#endif 182#endif
183 183
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 7ab1498814..aac74b266a 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -2279,11 +2279,11 @@ _edje_param_validate(const Edje_External_Param *param, const Edje_External_Param
2279 return EINA_TRUE; 2279 return EINA_TRUE;
2280 2280
2281 case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE: 2281 case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE:
2282 if (!EINA_DBL_CMP(info->info.d.min, EDJE_EXTERNAL_DOUBLE_UNSET) && 2282 if (!EINA_DBL_EQ(info->info.d.min, EDJE_EXTERNAL_DOUBLE_UNSET) &&
2283 (info->info.d.min > param->d)) 2283 (info->info.d.min > param->d))
2284 return EINA_FALSE; 2284 return EINA_FALSE;
2285 2285
2286 if (!EINA_DBL_CMP(info->info.d.max, EDJE_EXTERNAL_DOUBLE_UNSET) && 2286 if (!EINA_DBL_EQ(info->info.d.max, EDJE_EXTERNAL_DOUBLE_UNSET) &&
2287 (info->info.d.max < param->d)) 2287 (info->info.d.max < param->d))
2288 return EINA_FALSE; 2288 return EINA_FALSE;
2289 2289
diff --git a/src/lib/edje/edje_textblock_styles.c b/src/lib/edje/edje_textblock_styles.c
index 06cd8cd775..24cf2e1f0f 100644
--- a/src/lib/edje/edje_textblock_styles.c
+++ b/src/lib/edje/edje_textblock_styles.c
@@ -220,7 +220,7 @@ _edje_textblock_style_update(Edje *ed, Edje_Style *stl, Eina_Bool force)
220 eina_strbuf_append(txt, "font_source="); 220 eina_strbuf_append(txt, "font_source=");
221 eina_strbuf_append(txt, fontsource); 221 eina_strbuf_append(txt, fontsource);
222 } 222 }
223 if (!EINA_DBL_CMP(tag->font_size, 0)) 223 if (!EINA_DBL_EQ(tag->font_size, 0))
224 { 224 {
225 char font_size[32]; 225 char font_size[32];
226 226
diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
index e9cead7505..8eb729b41e 100644
--- a/src/lib/edje/edje_util.c
+++ b/src/lib/edje/edje_util.c
@@ -359,7 +359,7 @@ edje_password_show_last_set(Eina_Bool password_show_last)
359EAPI void 359EAPI void
360edje_password_show_last_timeout_set(double password_show_last_timeout) 360edje_password_show_last_timeout_set(double password_show_last_timeout)
361{ 361{
362 if (EINA_DBL_CMP(_edje_password_show_last_timeout, password_show_last_timeout)) return; 362 if (EINA_DBL_EQ(_edje_password_show_last_timeout, password_show_last_timeout)) return;
363 _edje_password_show_last_timeout = password_show_last_timeout; 363 _edje_password_show_last_timeout = password_show_last_timeout;
364} 364}
365 365