diff options
author | Cedric BAIL <cedric@osg.samsung.com> | 2015-04-03 16:38:00 +0200 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2015-04-03 16:38:00 +0200 |
commit | c1836b97edd63f65f5e655faa18d61b4e745326c (patch) | |
tree | 9e8d76a83fd7b7df1223f7552d1fec3cb81e316a | |
parent | 2613d17844245172d17a88bd321f53237fa9b5bc (diff) | |
download | efl-c1836b97edd63f65f5e655faa18d61b4e745326c.tar.gz |
evas: remove Efl.VG.Image for now as it was not implemented.
-rw-r--r-- | src/Makefile_Evas.am | 4 | ||||
-rw-r--r-- | src/lib/evas/Evas_Eo.h | 1 | ||||
-rw-r--r-- | src/lib/evas/canvas/efl_vg_image.eo | 35 | ||||
-rw-r--r-- | src/lib/evas/canvas/evas_vg_image.c | 110 |
4 files changed, 1 insertions, 149 deletions
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 2183302912..af8343ff9d 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -39,8 +39,7 @@ evas_eolian_files = \ lib/evas/canvas/efl_vg_root_node.eo \ lib/evas/canvas/efl_vg_gradient.eo \ lib/evas/canvas/efl_vg_gradient_radial.eo \ - lib/evas/canvas/efl_vg_gradient_linear.eo \ - lib/evas/canvas/efl_vg_image.eo + lib/evas/canvas/efl_vg_gradient_linear.eo evas_eolian_c = $(evas_eolian_files:%.eo=%.eo.c) evas_eolian_h = $(evas_eolian_files:%.eo=%.eo.h) \ @@ -222,7 +221,6 @@ lib/evas/canvas/evas_vg_gradient.c \ lib/evas/canvas/evas_vg_gradient_linear.c \ lib/evas/canvas/evas_vg_gradient_radial.c \ lib/evas/canvas/evas_vg_utils.c \ -lib/evas/canvas/evas_vg_image.c \ lib/evas/canvas/evas_vg_shape.c # Engine diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h index 49e1da2939..1e1c639bb0 100644 --- a/src/lib/evas/Evas_Eo.h +++ b/src/lib/evas/Evas_Eo.h @@ -861,4 +861,3 @@ typedef enum _Evas_3D_Material_Attrib #include "canvas/efl_vg_gradient.eo.h" #include "canvas/efl_vg_gradient_linear.eo.h" #include "canvas/efl_vg_gradient_radial.eo.h" -#include "canvas/efl_vg_image.eo.h" diff --git a/src/lib/evas/canvas/efl_vg_image.eo b/src/lib/evas/canvas/efl_vg_image.eo deleted file mode 100644 index 62d74510f4..0000000000 --- a/src/lib/evas/canvas/efl_vg_image.eo +++ /dev/null @@ -1,35 +0,0 @@ -class Efl.VG.Image (Efl.VG.Base, Efl.File) -{ - legacy_prefix: evas_vg_image; - properties { - position { - set { - } - get { - } - values { - int x; - int y; - } - } - size { - set { - } - get { - } - values { - uint w; - uint h; - } - } - // FIXME: add aspect ratio following SVG specification - } - implements { - Efl.File.file.set; - Efl.File.file.get; - Efl.File.mmap.set; - Efl.File.mmap.get; - Eo.Base.constructor; - Eo.Base.destructor; - } -}
\ No newline at end of file diff --git a/src/lib/evas/canvas/evas_vg_image.c b/src/lib/evas/canvas/evas_vg_image.c deleted file mode 100644 index 1bb0b1bc50..0000000000 --- a/src/lib/evas/canvas/evas_vg_image.c +++ /dev/null @@ -1,110 +0,0 @@ -#include "evas_common_private.h" -#include "evas_private.h" - -#include <strings.h> - -#include "evas_vg_private.h" - -typedef struct _Efl_VG_Image_Data Efl_VG_Image_Data; -struct _Efl_VG_Image_Data -{ - // FIXME: only manipulate Eina_File internally. - Eina_File *f; - Eina_Stringshare *key; - - int x, y; - unsigned int w, h; -}; - -static void -_efl_vg_image_position_set(Eo *obj, Efl_VG_Image_Data *pd, int x, int y) -{ - pd->x = x; - pd->y = y; - - _efl_vg_base_changed(obj); -} - -static void -_efl_vg_image_position_get(Eo *obj, Efl_VG_Image_Data *pd, int *x, int *y) -{ - if (x) *x = pd->x; - if (y) *y = pd->y; -} - -static void -_efl_vg_image_size_set(Eo *obj, Efl_VG_Image_Data *pd, - unsigned int w, unsigned int h) -{ - pd->w = w; - pd->h = h; - - _efl_vg_base_changed(obj); -} - -static void -_efl_vg_image_size_get(Eo *obj, Efl_VG_Image_Data *pd, - unsigned int *w, unsigned int *h) -{ - if (w) *w = pd->w; - if (h) *h = pd->h; -} - -static Eina_Bool -_efl_vg_image_efl_file_mmap_set(Eo *obj EINA_UNUSED, Efl_VG_Image_Data *pd, - const Eina_File *f, const char *key) -{ - Eina_File *tmp = pd->f; - - pd->f = eina_file_dup(f); - eina_file_close(tmp); - eina_stringshare_replace(&pd->key, key); - - _efl_vg_base_changed(obj); - - return EINA_TRUE; -} - -static void -_efl_vg_image_efl_file_mmap_get(Eo *obj EINA_UNUSED, Efl_VG_Image_Data *pd, - const Eina_File **f, const char **key) -{ - if (f) *f = pd->f; - if (key) *key = pd->key; -} - -static Eina_Bool -_efl_vg_image_efl_file_file_set(Eo *obj, Efl_VG_Image_Data *pd, - const char *file, const char *key) -{ - Eina_File *tmp; - Eina_Bool r; - - tmp = eina_file_open(file, EINA_FALSE); - r = _efl_vg_image_efl_file_mmap_set(obj, pd, tmp, key); - eina_file_close(tmp); - - return r; -} - -static void -_efl_vg_image_efl_file_file_get(Eo *obj EINA_UNUSED, Efl_VG_Image_Data *pd, - const char **file, const char **key) -{ - if (file) *file = eina_file_filename_get(pd->f); - if (key) *key = pd->key; -} - -static void -_efl_vg_image_eo_base_constructor(Eo *obj, Efl_VG_Image_Data *pd) -{ - eo_error_set(obj); -} - -static void -_efl_vg_image_eo_base_destructor(Eo *obj, Efl_VG_Image_Data *pd) -{ - eo_error_set(obj); -} - -#include "efl_vg_image.eo.c" |