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

evas: fix warnings introduced by Evas_3D eet import/export feature. 

Summary:
This is a fix of those warnings. Sorry for existence of them.
   CC       lib/evas/common/lib_evas_libevas_la-evas_alpha_main.lo
../../src/lib/evas/canvas/evas_3d_mesh_loader_eet.c:113:13: warning:
assignment from incompatible pointer type
     eet_file = _evas_3d_eet_file_new();
              ^
   CC       lib/evas/common/lib_evas_libevas_la-evas_blend_main.lo
   CC       lib/evas/common/lib_evas_libevas_la-evas_blit_main.lo
   CC       lib/evas/common/lib_evas_libevas_la-evas_convert_color.lo
../../src/lib/evas/canvas/evas_3d_mesh_saver_eet.c: In function
'evas_3d_mesh_save_eet':
../../src/lib/evas/canvas/evas_3d_mesh_saver_eet.c:159:13: warning:
assignment from incompatible pointer type
     eet_file = _evas_3d_eet_file_new();
              ^
   CC       lib/evas/common/lib_evas_libevas_la-evas_convert_colorspace.lo
   CC       lib/evas/common/lib_evas_libevas_la-evas_convert_gry_1.lo
../../src/lib/evas/canvas/evas_3d_eet.c: In function
'_evas_3d_eet_file_new':
../../src/lib/evas/canvas/evas_3d_eet.c:28:4: warning: return discards
'const' qualifier from pointer target type
     return creating_file;

Reviewers: cedric, artem.popov

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D1527

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
Bogdan Devichev 2014-10-08 18:42:41 +02:00 committed by Cedric BAIL
parent 15c6eab519
commit 1f9ace657b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/evas/canvas/evas_3d_eet.c
View File

@ -14,10 +14,10 @@ Eet_Data_Descriptor *_mesh_descriptor;
Eet_Data_Descriptor *_header_descriptor;
Eet_Data_Descriptor *_file_descriptor;
struct Evas_3D_File_Eet *
Evas_3D_File_Eet *
_evas_3d_eet_file_new(void)
{
const struct Evas_3D_File_Eet *creating_file = calloc(1, sizeof(Evas_3D_File_Eet));
Evas_3D_File_Eet *creating_file = calloc(1, sizeof(Evas_3D_File_Eet));
if (!creating_file)
{

2
src/lib/evas/include/evas_private.h
View File

@ -1608,7 +1608,7 @@ void evas_3d_scene_data_init(Evas_3D_Scene_Public_Data *data);
void evas_3d_scene_data_fini(Evas_3D_Scene_Public_Data *data);
/* Eet saver/loader functions */
struct Evas_3D_File_Eet *_evas_3d_eet_file_new(void);
Evas_3D_File_Eet *_evas_3d_eet_file_new(void);
void _evas_3d_eet_file_init(void);
void _evas_3d_eet_descriptor_shutdown(void);
void _evas_3d_eet_file_free(void);