diff options
author | Cedric BAIL <cedric@osg.samsung.com> | 2017-01-06 09:57:46 -0800 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2017-01-06 15:58:46 -0800 |
commit | 8f1c071d6adbf6f8e2002eeeabdc7f3d7be9ef22 (patch) | |
tree | 17bddaa85bcdead8807053b009d1adf1c9eda71c /src/bin | |
parent | f9928b75c8c4a2e6c3f02aafb68c8a569a47ab04 (diff) |
eina: rename EINA_{FLT,DBL}_CMP to EINA_{FLT,DBL}_EQ.
Diffstat (limited to 'src/bin')
-rw-r--r-- | src/bin/edje/edje_external_inspector.c | 8 | ||||
-rw-r--r-- | src/bin/edje/edje_svg_loader.c | 4 | ||||
-rw-r--r-- | src/bin/elementary/test_bg.c | 8 | ||||
-rw-r--r-- | src/bin/elementary/test_flip_page.c | 2 | ||||
-rw-r--r-- | src/bin/evas/evas_cserve2_shm_debug.c | 4 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/bin/edje/edje_external_inspector.c b/src/bin/edje/edje_external_inspector.c index c770bbe4d2..5fd8e5e5ee 100644 --- a/src/bin/edje/edje_external_inspector.c +++ b/src/bin/edje/edje_external_inspector.c | |||
@@ -114,7 +114,7 @@ _param_value_str_get(const Edje_External_Type *type, const Edje_External_Param_I | |||
114 | return buf; | 114 | return buf; |
115 | 115 | ||
116 | case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE: | 116 | case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE: |
117 | if (EINA_DBL_CMP(param->info.d.def, EDJE_EXTERNAL_DOUBLE_UNSET)) return NULL; | 117 | if (EINA_DBL_EQ(param->info.d.def, EDJE_EXTERNAL_DOUBLE_UNSET)) return NULL; |
118 | snprintf(buf, buflen, "%g", param->info.d.def); | 118 | snprintf(buf, buflen, "%g", param->info.d.def); |
119 | return buf; | 119 | return buf; |
120 | 120 | ||
@@ -219,17 +219,17 @@ _param_extra_details(const Edje_External_Type *type, const Edje_External_Param_I | |||
219 | break; | 219 | break; |
220 | 220 | ||
221 | case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE: | 221 | case EDJE_EXTERNAL_PARAM_TYPE_DOUBLE: |
222 | if (EINA_DBL_CMP(param->info.d.min, EDJE_EXTERNAL_DOUBLE_UNSET)) | 222 | if (EINA_DBL_EQ(param->info.d.min, EDJE_EXTERNAL_DOUBLE_UNSET)) |
223 | { | 223 | { |
224 | if (machine) printf("MIN: %g\n", param->info.d.min); | 224 | if (machine) printf("MIN: %g\n", param->info.d.min); |
225 | else printf(", min: %g", param->info.d.min); | 225 | else printf(", min: %g", param->info.d.min); |
226 | } | 226 | } |
227 | if (EINA_DBL_CMP(param->info.d.max, EDJE_EXTERNAL_DOUBLE_UNSET)) | 227 | if (EINA_DBL_EQ(param->info.d.max, EDJE_EXTERNAL_DOUBLE_UNSET)) |
228 | { | 228 | { |
229 | if (machine) printf("MAX: %g\n", param->info.d.max); | 229 | if (machine) printf("MAX: %g\n", param->info.d.max); |
230 | else printf(", max: %g", param->info.d.max); | 230 | else printf(", max: %g", param->info.d.max); |
231 | } | 231 | } |
232 | if (EINA_DBL_CMP(param->info.d.step, EDJE_EXTERNAL_DOUBLE_UNSET)) | 232 | if (EINA_DBL_EQ(param->info.d.step, EDJE_EXTERNAL_DOUBLE_UNSET)) |
233 | { | 233 | { |
234 | if (machine) printf("STEP: %g\n", param->info.d.step); | 234 | if (machine) printf("STEP: %g\n", param->info.d.step); |
235 | else printf(", step: %g", param->info.d.step); | 235 | else printf(", step: %g", param->info.d.step); |
diff --git a/src/bin/edje/edje_svg_loader.c b/src/bin/edje/edje_svg_loader.c index 0d8c5e5f68..beafb48a59 100644 --- a/src/bin/edje/edje_svg_loader.c +++ b/src/bin/edje/edje_svg_loader.c | |||
@@ -1233,8 +1233,8 @@ _attr_parse_rect_node(void *data, const char *key, const char *value) | |||
1233 | _parse_style_attr(node, key, value); | 1233 | _parse_style_attr(node, key, value); |
1234 | } | 1234 | } |
1235 | 1235 | ||
1236 | if (!EINA_DBL_CMP(rect->rx, 0) && EINA_DBL_CMP(rect->ry, 0)) rect->ry = rect->rx; | 1236 | if (!EINA_DBL_EQ(rect->rx, 0) && EINA_DBL_EQ(rect->ry, 0)) rect->ry = rect->rx; |
1237 | if (!EINA_DBL_CMP(rect->ry, 0) && EINA_DBL_CMP(rect->rx, 0)) rect->rx = rect->ry; | 1237 | if (!EINA_DBL_EQ(rect->ry, 0) && EINA_DBL_EQ(rect->rx, 0)) rect->rx = rect->ry; |
1238 | 1238 | ||
1239 | return EINA_TRUE; | 1239 | return EINA_TRUE; |
1240 | } | 1240 | } |
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c index bb6b1197a0..300dfd9dc0 100644 --- a/src/bin/elementary/test_bg.c +++ b/src/bin/elementary/test_bg.c | |||
@@ -47,13 +47,13 @@ _cb_color_changed(void *data, Evas_Object *obj, void *event EINA_UNUSED) | |||
47 | double val = 0.0; | 47 | double val = 0.0; |
48 | 48 | ||
49 | val = elm_spinner_value_get(obj); | 49 | val = elm_spinner_value_get(obj); |
50 | if (EINA_DBL_CMP(val, 1.0)) | 50 | if (EINA_DBL_EQ(val, 1.0)) |
51 | elm_bg_color_set(o_bg, 255, 255, 255); | 51 | elm_bg_color_set(o_bg, 255, 255, 255); |
52 | else if (EINA_DBL_CMP(val, 2.0)) | 52 | else if (EINA_DBL_EQ(val, 2.0)) |
53 | elm_bg_color_set(o_bg, 255, 0, 0); | 53 | elm_bg_color_set(o_bg, 255, 0, 0); |
54 | else if (EINA_DBL_CMP(val, 3.0)) | 54 | else if (EINA_DBL_EQ(val, 3.0)) |
55 | elm_bg_color_set(o_bg, 0, 0, 255); | 55 | elm_bg_color_set(o_bg, 0, 0, 255); |
56 | else if (EINA_DBL_CMP(val, 4.0)) | 56 | else if (EINA_DBL_EQ(val, 4.0)) |
57 | elm_bg_color_set(o_bg, 0, 255, 0); | 57 | elm_bg_color_set(o_bg, 0, 255, 0); |
58 | } | 58 | } |
59 | 59 | ||
diff --git a/src/bin/elementary/test_flip_page.c b/src/bin/elementary/test_flip_page.c index 4e9bec6ff2..2aebf175b2 100644 --- a/src/bin/elementary/test_flip_page.c +++ b/src/bin/elementary/test_flip_page.c | |||
@@ -385,7 +385,7 @@ _state_update(State *st) | |||
385 | 385 | ||
386 | if (mx < 1) mx = 1; // quick hack to keep curl line visible | 386 | if (mx < 1) mx = 1; // quick hack to keep curl line visible |
387 | 387 | ||
388 | if (EINA_DBL_CMP(mgrad, 0.0)) // special horizontal case | 388 | if (EINA_DBL_EQ(mgrad, 0.0)) // special horizontal case |
389 | mgrad = 0.001; // quick dirty hack for now | 389 | mgrad = 0.001; // quick dirty hack for now |
390 | // else | 390 | // else |
391 | { | 391 | { |
diff --git a/src/bin/evas/evas_cserve2_shm_debug.c b/src/bin/evas/evas_cserve2_shm_debug.c index 27112180ec..18b87c4d03 100644 --- a/src/bin/evas/evas_cserve2_shm_debug.c +++ b/src/bin/evas/evas_cserve2_shm_debug.c | |||
@@ -431,7 +431,7 @@ _files_all_print_all(void) | |||
431 | _shared_string_get(fd->path), _shared_string_get(fd->key)); | 431 | _shared_string_get(fd->path), _shared_string_get(fd->key)); |
432 | printf("LoadOpts: Region: %d,%d-%dx%d\n", | 432 | printf("LoadOpts: Region: %d,%d-%dx%d\n", |
433 | fd->lo.region.x, fd->lo.region.y, fd->lo.region.w, fd->lo.region.h); | 433 | fd->lo.region.x, fd->lo.region.y, fd->lo.region.w, fd->lo.region.h); |
434 | if (!EINA_DBL_CMP(fd->lo.dpi, 0)) | 434 | if (!EINA_DBL_EQ(fd->lo.dpi, 0)) |
435 | printf(" DPI: %f\n"); | 435 | printf(" DPI: %f\n"); |
436 | else | 436 | else |
437 | printf(" DPI: 0\n"); | 437 | printf(" DPI: 0\n"); |
@@ -519,7 +519,7 @@ _images_all_print_full(void) | |||
519 | printf(" height %d\n", id->opts.emile.h); | 519 | printf(" height %d\n", id->opts.emile.h); |
520 | printf(" degree %d\n", id->opts.emile.degree); | 520 | printf(" degree %d\n", id->opts.emile.degree); |
521 | printf(" scale_down_by %d\n", id->opts.emile.scale_down_by); | 521 | printf(" scale_down_by %d\n", id->opts.emile.scale_down_by); |
522 | if (!EINA_DBL_CMP(id->opts.emile.dpi, 0.0)) | 522 | if (!EINA_DBL_EQ(id->opts.emile.dpi, 0.0)) |
523 | printf(" dpi %.2f\n", id->opts.emile.dpi); | 523 | printf(" dpi %.2f\n", id->opts.emile.dpi); |
524 | else | 524 | else |
525 | printf(" dpi 0\n"); | 525 | printf(" dpi 0\n"); |