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

evas: silence warning. 

So I don't like this data being void and stride being in bytes, but changing it
for silencing a warning will be a massive change. I will put that on the major
cleanup that Evas_3D need to receive.
This commit is contained in:
Cedric BAIL 2015-06-03 17:56:22 +02:00
parent 5892fc630c
commit 408fc6237e
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/evas/canvas/evas_3d_mesh.c
View File

@ -920,9 +920,9 @@ evas_3d_mesh_interpolate_position_get(Evas_Vec3 *out, const Evas_3D_Vertex_Buffe
float *ptr;
if (pos0->stride != 0.0)
ptr = (char *)pos0->data + pos0->stride * index;
ptr = (float *)((char *)pos0->data + pos0->stride * index);
else
ptr = (char *)pos0->data + (3 * sizeof(float)) * index;
ptr = (float *)pos0->data + 3 * index;
out->x = ptr[0];
out->y = ptr[1];
@ -933,14 +933,14 @@ evas_3d_mesh_interpolate_position_get(Evas_Vec3 *out, const Evas_3D_Vertex_Buffe
float *ptr0, *ptr1;
if (pos0->stride != 0.0)
ptr0 = (char *)pos0->data + pos0->stride * index;
ptr0 = (float *)((char *)pos0->data + pos0->stride * index);
else
ptr0 = (char *)pos0->data + (3 * sizeof(float)) * index;
ptr0 = (float *)pos0->data + 3 * index;
if (pos1->stride != 0.0)
ptr1 = (char *)pos1->data + pos1->stride * index;
ptr1 = (float *)((char *)pos1->data + pos1->stride * index);
else
ptr1 = (char *)pos1->data + (3 * sizeof(float)) * index;
ptr1 = (float *)pos1->data + 3 * index;
out->x = ptr0[0] * weight + ptr1[0] * (1.0 - weight);
out->y = ptr0[1] * weight + ptr1[1] * (1.0 - weight);

2
src/lib/evas/canvas/evas_3d_primitive.c
View File

@ -35,7 +35,7 @@ _evas_3d_primitive_eo_base_constructor(Eo *obj, Evas_3D_Primitive_Data *pd)
}
EOLIAN static void
_evas_3d_primitive_eo_base_destructor(Eo *obj, Evas_3D_Primitive_Data *pd)
_evas_3d_primitive_eo_base_destructor(Eo *obj, Evas_3D_Primitive_Data *pd EINA_UNUSED)
{
eo_do_super(obj, MY_CLASS, eo_destructor());
}