summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric@osg.samsung.com>2015-06-03 17:56:22 +0200
committerCedric BAIL <cedric@osg.samsung.com>2015-06-03 18:17:23 +0200
commit408fc6237ea65a287331781312272e6a5974b156 (patch)
tree78f6d6c59cf730a3cea60f95377cf2a2a16eb00d
parent5892fc630cf61864bf8185a6c536e644b8a59975 (diff)
downloadefl-408fc6237ea65a287331781312272e6a5974b156.tar.gz
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.
-rw-r--r--src/lib/evas/canvas/evas_3d_mesh.c12
-rw-r--r--src/lib/evas/canvas/evas_3d_primitive.c2
2 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/evas/canvas/evas_3d_mesh.c b/src/lib/evas/canvas/evas_3d_mesh.c
index c51afacf30..506e942483 100644
--- a/src/lib/evas/canvas/evas_3d_mesh.c
+++ b/src/lib/evas/canvas/evas_3d_mesh.c
@@ -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);
diff --git a/src/lib/evas/canvas/evas_3d_primitive.c b/src/lib/evas/canvas/evas_3d_primitive.c
index 6314c4a6c6..79b05d253e 100644
--- a/src/lib/evas/canvas/evas_3d_primitive.c
+++ b/src/lib/evas/canvas/evas_3d_primitive.c
@@ -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());
}