diff options
| author | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-03-21 15:38:19 +0900 |
|---|---|---|
| committer | Jean-Philippe Andre <jp.andre@samsung.com> | 2016-03-28 16:40:01 +0900 |
| commit | d4e713a18c07f9f5b819d863373402a2b96ca522 (patch) | |
| tree | 1c7ddfe2fd99f1688c6108cbf7a51dc8e3908abb | |
| parent | 0d41ad0c837a2e1655a4d41c28ec7f0ccf10639c (diff) | |
| download | efl-d4e713a18c07f9f5b819d863373402a2b96ca522.tar.gz | |
Evas.Image: Move stride.get away from Evas.Image
stride does not apply to all image objects, eg. proxies or 3d scenes.
it will be implemented by the classes that support stride and pixel
data access
| -rw-r--r-- | src/lib/evas/canvas/evas_image.eo | 1 | ||||
| -rw-r--r-- | src/lib/evas/canvas/evas_image_legacy.c | 3 | ||||
| -rw-r--r-- | src/lib/evas/canvas/evas_object_image.c | 6 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/evas/canvas/evas_image.eo b/src/lib/evas/canvas/evas_image.eo index 5fe400ac7e..b4f4f3c8b1 100644 --- a/src/lib/evas/canvas/evas_image.eo +++ b/src/lib/evas/canvas/evas_image.eo @@ -67,7 +67,6 @@ class Evas.Image (Evas.Object, Evas.Filter, Efl.Gfx.Buffer.alpha.get; Efl.Gfx.Buffer.alpha.set; Efl.Gfx.Buffer.buffer_update_add; - Efl.Gfx.Buffer.stride.get; Efl.Gfx.Buffer.colorspace.get; Efl.Gfx.Buffer.buffer_get; Efl.Gfx.Buffer.buffer_set; diff --git a/src/lib/evas/canvas/evas_image_legacy.c b/src/lib/evas/canvas/evas_image_legacy.c index 01c935387d..80d9a0fc24 100644 --- a/src/lib/evas/canvas/evas_image_legacy.c +++ b/src/lib/evas/canvas/evas_image_legacy.c @@ -157,7 +157,8 @@ EAPI int evas_object_image_stride_get(const Evas_Object *obj) { EVAS_IMAGE_API(obj, 0); - return efl_gfx_buffer_stride_get(obj); + Evas_Image_Data *o = eo_data_scope_get(eo_obj, EVAS_IMAGE_CLASS); + return o->cur->image.stride; } EAPI void diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index 7e05c53605..959d08e2f7 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -622,12 +622,6 @@ _evas_image_efl_gfx_view_view_size_get(Eo *eo_obj, Evas_Image_Data *o, int *w, i if (h) *h = uvh; } -EOLIAN static int -_evas_image_efl_gfx_buffer_stride_get(Eo *eo_obj EINA_UNUSED, Evas_Image_Data *o) -{ - return o->cur->image.stride; -} - EOLIAN static void _evas_image_efl_gfx_buffer_buffer_update_add(Eo *eo_obj, Evas_Image_Data *o, int x, int y, int w, int h) { |