zmike pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=eb4af00c30f3f80e0d9707bfb44341ef302cda87
commit eb4af00c30f3f80e0d9707bfb44341ef302cda87
Author: Yeongjong Lee <yj34....@samsung.com>
Date: Tue Feb 11 08:56:34 2020 -0500
elm perf_test: fix warning of implicit conversion of floating point
Summary:
The result of integral division is converted into floating point.
In order to fix this warning, it changes denominator to double from integer.
Reviewers: Jaehyun_Cho, Hermet, zmike
Reviewed By: zmike
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D11313
---
src/bin/elementary/perf_test_01.c | 4 ++--
src/bin/elementary/perf_test_02.c | 4 ++--
src/bin/elementary/perf_test_03.c | 4 ++--
src/bin/elementary/perf_test_04.c | 4 ++--
src/bin/elementary/perf_test_05.c | 4 ++--
src/bin/elementary/perf_test_06.c | 4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/bin/elementary/perf_test_01.c
b/src/bin/elementary/perf_test_01.c
index d29f84813b..ef7f32d112 100644
--- a/src/bin/elementary/perf_test_01.c
+++ b/src/bin/elementary/perf_test_01.c
@@ -36,9 +36,9 @@ TST(01, tick) (Evas *e EINA_UNUSED, double f, Evas_Coord
win_w, Evas_Coord win_h
w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2);
h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2);
x = (win_w / 2) - (w / 2);
- x += (Evas_Coord)(sin((double)((f * 50.0) + (i * 13))) * (w0 / 2));
+ x += (Evas_Coord)(sin((double)((f * 50.0) + (i * 13))) * (w0 / 2.0));
y = (win_h / 2) - (h / 2);
- y += (Evas_Coord)(cos((double)((f * 45.0) + (i * 28))) * (h0 / 2));
+ y += (Evas_Coord)(cos((double)((f * 45.0) + (i * 28))) * (h0 / 2.0));
evas_object_geometry_set(o, x, y, w, h);
}
}
diff --git a/src/bin/elementary/perf_test_02.c
b/src/bin/elementary/perf_test_02.c
index ac381c732a..e5f10f1549 100644
--- a/src/bin/elementary/perf_test_02.c
+++ b/src/bin/elementary/perf_test_02.c
@@ -36,9 +36,9 @@ TST(02, tick) (Evas *e EINA_UNUSED, double f, Evas_Coord
win_w, Evas_Coord win_h
w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2);
h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2);
x = (win_w / 2) - (w / 2);
- x += (Evas_Coord)(sin((double)((f * 50.0) + (i * 13))) * (w0 / 2));
+ x += (Evas_Coord)(sin((double)((f * 50.0) + (i * 13))) * (w0 / 2.0));
y = (win_h / 2) - (h / 2);
- y += (Evas_Coord)(cos((double)((f * 45.0) + (i * 28))) * (h0 / 2));
+ y += (Evas_Coord)(cos((double)((f * 45.0) + (i * 28))) * (h0 / 2.0));
evas_object_geometry_set(o, x, y, w, h);
}
}
diff --git a/src/bin/elementary/perf_test_03.c
b/src/bin/elementary/perf_test_03.c
index 6737bedac5..ab35044538 100644
--- a/src/bin/elementary/perf_test_03.c
+++ b/src/bin/elementary/perf_test_03.c
@@ -36,9 +36,9 @@ TST(03, tick) (Evas *e EINA_UNUSED, double f, Evas_Coord
win_w, Evas_Coord win_h
w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2);
h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2);
x = (win_w / 2) - (w / 2);
- x += (Evas_Coord)(sin((double)((f * 50.0) + (i * 13))) * (w0 / 2));
+ x += (Evas_Coord)(sin((double)((f * 50.0) + (i * 13))) * (w0 / 2.0));
y = (win_h / 2) - (h / 2);
- y += (Evas_Coord)(cos((double)((f * 45.0) + (i * 28))) * (h0 / 2));
+ y += (Evas_Coord)(cos((double)((f * 45.0) + (i * 28))) * (h0 / 2.0));
evas_object_geometry_set(o, x, y, w, h);
}
}
diff --git a/src/bin/elementary/perf_test_04.c
b/src/bin/elementary/perf_test_04.c
index 17aae98342..d593096f32 100644
--- a/src/bin/elementary/perf_test_04.c
+++ b/src/bin/elementary/perf_test_04.c
@@ -36,9 +36,9 @@ TST(04, tick) (Evas *e EINA_UNUSED, double f, Evas_Coord
win_w, Evas_Coord win_h
w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2);
h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2);
x = (win_w / 2) - (w / 2);
- x += sin((double)((f * 50.0) + (i * 13))) * (w0 / 2);
+ x += sin((double)((f * 50.0) + (i * 13))) * (w0 / 2.0);
y = (win_h / 2) - (h / 2);
- y += cos((double)((f * 45.0) + (i * 28))) * (h0 / 2);
+ y += cos((double)((f * 45.0) + (i * 28))) * (h0 / 2.0);
evas_object_geometry_set(o, x, y, w, h);
}
}
diff --git a/src/bin/elementary/perf_test_05.c
b/src/bin/elementary/perf_test_05.c
index 64618ae608..1016952875 100644
--- a/src/bin/elementary/perf_test_05.c
+++ b/src/bin/elementary/perf_test_05.c
@@ -36,9 +36,9 @@ TST(05, tick) (Evas *e EINA_UNUSED, double f, Evas_Coord
win_w, Evas_Coord win_h
w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2);
h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2);
x = (win_w / 2) - (w / 2);
- x += sin((double)((f * 50.0) + (i * 13))) * (w0 / 2);
+ x += sin((double)((f * 50.0) + (i * 13))) * (w0 / 2.0);
y = (win_h / 2) - (h / 2);
- y += cos((double)((f * 45.0) + (i * 28))) * (h0 / 2);
+ y += cos((double)((f * 45.0) + (i * 28))) * (h0 / 2.0);
evas_object_geometry_set(o, x, y, w, h);
}
}
diff --git a/src/bin/elementary/perf_test_06.c
b/src/bin/elementary/perf_test_06.c
index 952a4bced2..d227d65557 100644
--- a/src/bin/elementary/perf_test_06.c
+++ b/src/bin/elementary/perf_test_06.c
@@ -36,9 +36,9 @@ TST(06, tick) (Evas *e EINA_UNUSED, double f, Evas_Coord
win_w, Evas_Coord win_h
w = 5 + ((1.0 + cos((double)((f * 30.0) + (i * 10)))) * w0 * 2);
h = 5 + ((1.0 + sin((double)((f * 40.0) + (i * 19)))) * h0 * 2);
x = (win_w / 2) - (w / 2);
- x += sin((double)((f * 50.0) + (i * 13))) * (w0 / 2);
+ x += sin((double)((f * 50.0) + (i * 13))) * (w0 / 2.0);
y = (win_h / 2) - (h / 2);
- y += cos((double)((f * 45.0) + (i * 28))) * (h0 / 2);
+ y += cos((double)((f * 45.0) + (i * 28))) * (h0 / 2.0);
evas_object_geometry_set(o, x, y, w, h);
}
}
--
