styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efx - valid casts to silence warnings - same enum vals by design

This commit is contained in:
Carsten Haitzler 2020-01-15 17:05:18 +01:00
parent 13e696ce46
commit 9c8661abe2
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/efx/efx_move.c
View File

@ -40,7 +40,7 @@ _move_circle_cb(E_Efx_Move_Data *emd, double pos)
Evas_Coord xx, yy, ox, oy, w, h;
pct = ecore_animator_pos_map(pos, emd->speed, 0, 0);
pct = ecore_animator_pos_map(pos, (Ecore_Pos_Map)emd->speed, 0, 0);
degrees = pct * emd->degrees;
ox = emd->e->x, oy = emd->e->y;
if (emd->e->resize_data)
@ -80,7 +80,7 @@ _move_cb(E_Efx_Move_Data *emd, double pos)
Eina_List *l;
E_EFX *e;
pct = ecore_animator_pos_map(pos, emd->speed, 0, 0);
pct = ecore_animator_pos_map(pos, (Ecore_Pos_Map)emd->speed, 0, 0);
x = lround(pct * (double)emd->change.x) - emd->current.x;
y = lround(pct * (double)emd->change.y) - emd->current.y;
_e_efx_resize_adjust(emd->e, &x, &y);

2
src/bin/efx/efx_resize.c
View File

@ -61,7 +61,7 @@ _resize_cb(E_Efx_Resize_Data *erd, double pos)
{
int w, h;
factor = ecore_animator_pos_map(pos, erd->speed, 0, 0);
factor = ecore_animator_pos_map(pos, (Ecore_Pos_Map)erd->speed, 0, 0);
w = lround(factor * (erd->w - erd->start_w)) + erd->start_w;
h = lround(factor * (erd->h - erd->start_h)) + erd->start_h;
//DBG("%p to (%dx%d)", erd->e->obj, w, h);

2
src/bin/efx/efx_rotate.c
View File

@ -27,7 +27,7 @@ _rotate_cb(E_Efx_Rotate_Data *erd, double pos)
Eina_List *l;
E_EFX *e;
degrees = ecore_animator_pos_map(pos, erd->speed, 0, 0);
degrees = ecore_animator_pos_map(pos, (Ecore_Pos_Map)erd->speed, 0, 0);
erd->e->map_data.rotation = degrees * erd->degrees + erd->start_degrees;
//DBG("erd->e->map_data.rotation=%g,erd->degrees=%g,erd->start_degrees=%g", erd->e->map_data.rotation, erd->degrees, erd->start_degrees);
e_efx_maps_apply(erd->e, erd->e->obj, NULL, E_EFX_MAPS_APPLY_ALL);

2
src/bin/efx/efx_zoom.c
View File

@ -58,7 +58,7 @@ _zoom_cb(E_Efx_Zoom_Data *ezd, double pos)
Eina_List *l;
E_EFX *e;
zoom = ecore_animator_pos_map(pos, ezd->speed, 0, 0);
zoom = ecore_animator_pos_map(pos, (Ecore_Pos_Map)ezd->speed, 0, 0);
ezd->e->map_data.zoom = (zoom * (ezd->ending_zoom - ezd->starting_zoom)) + ezd->starting_zoom;
//DBG("total: %g || zoom (pos %g): %g || endzoom: %g || startzoom: %g", ezd->e->map_data.zoom, zoom, pos, ezd->ending_zoom, ezd->starting_zoom);
e_efx_maps_apply(ezd->e, ezd->e->obj, NULL, E_EFX_MAPS_APPLY_ALL);