jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=22353e31e13ba4c13acc2edecb9cc69394cc2d99
commit 22353e31e13ba4c13acc2edecb9cc69394cc2d99
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Fri Mar 25 16:44:25 2016 +0900
Efl.Canvas.Image: Remove object data for maps
The engine is responsible for the complete tracking of
maps.
Also, make buffer_unmap return bool.
---
src/lib/efl/interfaces/efl_gfx_buffer.eo | 7 +-
src/lib/evas/canvas/efl_canvas_image.c | 167 ++++++---------------
src/lib/evas/canvas/efl_canvas_image.eo | 5 +-
src/lib/evas/include/evas_private.h | 3 +-
.../evas/engines/software_generic/evas_engine.c | 36 ++++-
5 files changed, 85 insertions(+), 133 deletions(-)
diff --git a/src/lib/efl/interfaces/efl_gfx_buffer.eo
b/src/lib/efl/interfaces/efl_gfx_buffer.eo
index 2492792..8019145 100644
--- a/src/lib/efl/interfaces/efl_gfx_buffer.eo
+++ b/src/lib/efl/interfaces/efl_gfx_buffer.eo
@@ -118,10 +118,7 @@ interface Efl.Gfx.Buffer ()
}
}
- /* FIXME: not bindable to JS, potentially tricky to bind to Lua */
-
- /* FIXME: split into read-only and writeable methods? */
- /* FIXME: This was copy pasta from ector generic buffer. changed a bit.
*/
+ /* Note: Not for bindings, only C/C++ */
buffer_map {
[[Map a region of this buffer for read or write access by the CPU.
@@ -156,6 +153,8 @@ interface Efl.Gfx.Buffer ()
@in data: void*; [[Data pointer returned by a previous call to
map]]
@in length: int; [[Must be the same as returned by map.]]
}
+ return: bool; [[This will return $false in case of failure (invalid
+ parameters or state of the object).]]
}
/* FIXME: naming: buffer_set, buffer_attach, external_data_set, ...? */
diff --git a/src/lib/evas/canvas/efl_canvas_image.c
b/src/lib/evas/canvas/efl_canvas_image.c
index 5a65050..45e5d50 100644
--- a/src/lib/evas/canvas/efl_canvas_image.c
+++ b/src/lib/evas/canvas/efl_canvas_image.c
@@ -3,56 +3,6 @@
#define MY_CLASS EFL_CANVAS_IMAGE_CLASS
-// see also: ector_software_buffer
-typedef struct {
- EINA_INLIST;
- unsigned char *ptr;
- int size; // in bytes
-} Map_Data;
-
-typedef struct {
- Map_Data *maps;
-} Map_Data_Cow;
-
-typedef struct {
- const Map_Data_Cow *map_data;
-} Efl_Canvas_Image_Data;
-
-static Eina_Cow *_map_data_cow = NULL;
-static const Map_Data_Cow _map_data_cow_default = { NULL };
-
-EOLIAN static void
-_efl_canvas_image_class_constructor(Eo_Class *eo_class EINA_UNUSED)
-{
- if (!_map_data_cow)
- {
- _map_data_cow = eina_cow_add("image_map_data", sizeof(Map_Data_Cow),
- 1, &_map_data_cow_default, EINA_FALSE);
- }
-}
-
-EOLIAN static void
-_efl_canvas_image_class_destructor(Eo_Class *eo_class EINA_UNUSED)
-{
- eina_cow_del(_map_data_cow);
- _map_data_cow = NULL;
-}
-
-EOLIAN static Eo_Base *
-_efl_canvas_image_eo_base_constructor(Eo *obj, Efl_Canvas_Image_Data *pd)
-{
- obj = eo_constructor(eo_super(obj, MY_CLASS));
- pd->map_data = eina_cow_alloc(_map_data_cow);
- return obj;
-}
-
-EOLIAN static void
-_efl_canvas_image_eo_base_destructor(Eo *obj, Efl_Canvas_Image_Data *pd)
-{
- eina_cow_free(_map_data_cow, (const Eina_Cow_Data **) &pd->map_data);
- eo_destructor(eo_super(obj, MY_CLASS));
-}
-
Eina_Bool
_evas_image_mmap_set(Eo *eo_obj, const Eina_File *f, const char *key)
{
@@ -77,7 +27,7 @@ _evas_image_mmap_set(Eo *eo_obj, const Eina_File *f, const
char *key)
}
EOLIAN static Eina_Bool
-_efl_canvas_image_efl_file_mmap_set(Eo *eo_obj, Efl_Canvas_Image_Data *pd
EINA_UNUSED,
+_efl_canvas_image_efl_file_mmap_set(Eo *eo_obj, void *_pd EINA_UNUSED
EINA_UNUSED,
const Eina_File *f, const char *key)
{
return _evas_image_mmap_set(eo_obj, f, key);
@@ -95,7 +45,7 @@ _evas_image_mmap_get(const Eo *eo_obj, const Eina_File **f,
const char **key)
}
EOLIAN static void
-_efl_canvas_image_efl_file_mmap_get(Eo *eo_obj, Efl_Canvas_Image_Data *pd
EINA_UNUSED,
+_efl_canvas_image_efl_file_mmap_get(Eo *eo_obj, void *_pd EINA_UNUSED
EINA_UNUSED,
const Eina_File **f, const char **key)
{
_evas_image_mmap_get(eo_obj, f, key);
@@ -126,7 +76,7 @@ _evas_image_file_set(Eo *eo_obj, const char *file, const
char *key)
}
EOLIAN static Eina_Bool
-_efl_canvas_image_efl_file_file_set(Eo *eo_obj, Efl_Canvas_Image_Data *pd
EINA_UNUSED,
+_efl_canvas_image_efl_file_file_set(Eo *eo_obj, void *_pd EINA_UNUSED
EINA_UNUSED,
const char *file, const char *key)
{
return _evas_image_file_set(eo_obj, file, key);
@@ -148,7 +98,7 @@ _evas_image_file_get(const Eo *eo_obj, const char **file,
const char **key)
}
EOLIAN static void
-_efl_canvas_image_efl_file_file_get(Eo *eo_obj, Efl_Canvas_Image_Data *pd
EINA_UNUSED,
+_efl_canvas_image_efl_file_file_get(Eo *eo_obj, void *_pd EINA_UNUSED
EINA_UNUSED,
const char **file, const char **key)
{
_evas_image_file_get(eo_obj, file, key);
@@ -163,7 +113,7 @@ _evas_image_load_error_get(const Eo *eo_obj)
}
EOLIAN static Efl_Image_Load_Error
-_efl_canvas_image_efl_image_load_load_error_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED)
+_efl_canvas_image_efl_image_load_load_error_get(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED)
{
return _evas_image_load_error_get(eo_obj);
}
@@ -209,7 +159,7 @@ _evas_image_load_async_start(Eo *eo_obj)
}
EOLIAN static void
-_efl_canvas_image_efl_image_load_load_async_start(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED)
+_efl_canvas_image_efl_image_load_load_async_start(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED)
{
_evas_image_load_async_start(eo_obj);
}
@@ -225,7 +175,7 @@ _evas_image_load_async_cancel(Eo *eo_obj)
}
EOLIAN static void
-_efl_canvas_image_efl_image_load_load_async_cancel(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED)
+_efl_canvas_image_efl_image_load_load_async_cancel(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED)
{
_evas_image_load_async_cancel(eo_obj);
}
@@ -253,7 +203,7 @@ _evas_image_load_dpi_set(Eo *eo_obj, double dpi)
}
EOLIAN static void
-_efl_canvas_image_efl_image_load_load_dpi_set(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED, double dpi)
+_efl_canvas_image_efl_image_load_load_dpi_set(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED, double dpi)
{
_evas_image_load_dpi_set(eo_obj, dpi);
}
@@ -267,7 +217,7 @@ _evas_image_load_dpi_get(const Eo *eo_obj)
}
EOLIAN static double
-_efl_canvas_image_efl_image_load_load_dpi_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED)
+_efl_canvas_image_efl_image_load_load_dpi_get(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED)
{
return _evas_image_load_dpi_get(eo_obj);
}
@@ -299,7 +249,7 @@ _evas_image_load_size_set(Eo *eo_obj, int w, int h)
}
EOLIAN static void
-_efl_canvas_image_efl_image_load_load_size_set(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED, int w, int h)
+_efl_canvas_image_efl_image_load_load_size_set(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED, int w, int h)
{
_evas_image_load_size_set(eo_obj, w, h);
}
@@ -314,7 +264,7 @@ _evas_image_load_size_get(const Eo *eo_obj, int *w, int *h)
}
EOLIAN static void
-_efl_canvas_image_efl_image_load_load_size_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED, int *w, int *h)
+_efl_canvas_image_efl_image_load_load_size_get(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED, int *w, int *h)
{
_evas_image_load_size_get(eo_obj, w, h);
}
@@ -342,7 +292,7 @@ _evas_image_load_scale_down_set(Eo *eo_obj, int scale_down)
}
EOLIAN static void
-_efl_canvas_image_efl_image_load_load_scale_down_set(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED, int scale_down)
+_efl_canvas_image_efl_image_load_load_scale_down_set(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED, int scale_down)
{
_evas_image_load_scale_down_set(eo_obj, scale_down);
}
@@ -356,7 +306,7 @@ _evas_image_load_scale_down_get(const Eo *eo_obj)
}
EOLIAN static int
-_efl_canvas_image_efl_image_load_load_scale_down_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED)
+_efl_canvas_image_efl_image_load_load_scale_down_get(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED)
{
return _evas_image_load_scale_down_get(eo_obj);
}
@@ -390,7 +340,7 @@ _evas_image_load_region_set(Eo *eo_obj, int x, int y, int
w, int h)
}
EOLIAN static void
-_efl_canvas_image_efl_image_load_load_region_set(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED, int x, int y, int w, int h)
+_efl_canvas_image_efl_image_load_load_region_set(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED, int x, int y, int w, int h)
{
_evas_image_load_region_set(eo_obj, x, y, w, h);
}
@@ -407,7 +357,7 @@ _evas_image_load_region_get(const Eo *eo_obj, int *x, int
*y, int *w, int *h)
}
EOLIAN static void
-_efl_canvas_image_efl_image_load_load_region_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED, int *x, int *y, int *w, int *h)
+_efl_canvas_image_efl_image_load_load_region_get(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED, int *x, int *y, int *w, int *h)
{
_evas_image_load_region_get(eo_obj, x, y, w, h);
}
@@ -427,7 +377,7 @@ _evas_image_load_orientation_set(Eo *eo_obj, Eina_Bool
enable)
}
EOLIAN static void
-_efl_canvas_image_efl_image_load_load_orientation_set(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED, Eina_Bool enable)
+_efl_canvas_image_efl_image_load_load_orientation_set(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED, Eina_Bool enable)
{
_evas_image_load_orientation_set(eo_obj, enable);
}
@@ -441,7 +391,7 @@ _evas_image_load_orientation_get(const Eo *eo_obj)
}
EOLIAN static Eina_Bool
-_efl_canvas_image_efl_image_load_load_orientation_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED)
+_efl_canvas_image_efl_image_load_load_orientation_get(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED)
{
return _evas_image_load_orientation_get(eo_obj);
}
@@ -456,7 +406,7 @@ _evas_image_load_region_support_get(const Eo *eo_obj)
}
EOLIAN static Eina_Bool
-_efl_canvas_image_efl_image_load_load_region_support_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED)
+_efl_canvas_image_efl_image_load_load_region_support_get(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED)
{
return _evas_image_load_region_support_get(eo_obj);
}
@@ -475,7 +425,7 @@ _evas_image_animated_get(const Eo *eo_obj)
}
EOLIAN static Eina_Bool
-_efl_canvas_image_efl_image_animated_animated_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED)
+_efl_canvas_image_efl_image_animated_animated_get(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED)
{
return _evas_image_animated_get(eo_obj);
}
@@ -495,7 +445,7 @@ _evas_image_animated_frame_count_get(const Eo *eo_obj)
}
EOLIAN static int
-_efl_canvas_image_efl_image_animated_animated_frame_count_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED)
+_efl_canvas_image_efl_image_animated_animated_frame_count_get(Eo *eo_obj, void
*_pd EINA_UNUSED EINA_UNUSED)
{
return _evas_image_animated_frame_count_get(eo_obj);
}
@@ -514,7 +464,7 @@ _evas_image_animated_loop_type_get(const Eo *eo_obj)
}
EOLIAN static Efl_Image_Animated_Loop_Hint
-_efl_canvas_image_efl_image_animated_animated_loop_type_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED)
+_efl_canvas_image_efl_image_animated_animated_loop_type_get(Eo *eo_obj, void
*_pd EINA_UNUSED EINA_UNUSED)
{
return _evas_image_animated_loop_type_get(eo_obj);
}
@@ -533,7 +483,7 @@ _evas_image_animated_loop_count_get(const Eo *eo_obj)
}
EOLIAN static int
-_efl_canvas_image_efl_image_animated_animated_loop_count_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED)
+_efl_canvas_image_efl_image_animated_animated_loop_count_get(Eo *eo_obj, void
*_pd EINA_UNUSED EINA_UNUSED)
{
return _evas_image_animated_loop_count_get(eo_obj);
}
@@ -557,7 +507,7 @@ _evas_image_animated_frame_duration_get(const Eo *eo_obj,
int start_frame, int f
}
EOLIAN static double
-_efl_canvas_image_efl_image_animated_animated_frame_duration_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED, int start_frame, int frame_num)
+_efl_canvas_image_efl_image_animated_animated_frame_duration_get(Eo *eo_obj,
void *_pd EINA_UNUSED EINA_UNUSED, int start_frame, int frame_num)
{
return _evas_image_animated_frame_duration_get(eo_obj, start_frame,
frame_num);
}
@@ -599,7 +549,7 @@ _evas_image_animated_frame_set(Eo *eo_obj, int frame_index)
}
EOLIAN static Eina_Bool
-_efl_canvas_image_efl_image_animated_animated_frame_set(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED, int frame_index)
+_efl_canvas_image_efl_image_animated_animated_frame_set(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED, int frame_index)
{
return _evas_image_animated_frame_set(eo_obj, frame_index);
}
@@ -615,13 +565,13 @@ _evas_image_animated_frame_get(const Eo *eo_obj)
}
EOLIAN static int
-_efl_canvas_image_efl_image_animated_animated_frame_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED)
+_efl_canvas_image_efl_image_animated_animated_frame_get(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED)
{
return _evas_image_animated_frame_get(eo_obj);
}
EOLIAN static void
-_efl_canvas_image_efl_gfx_buffer_buffer_size_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED, int *w, int *h)
+_efl_canvas_image_efl_gfx_buffer_buffer_size_get(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED, int *w, int *h)
{
Evas_Image_Data *o = eo_data_scope_get(eo_obj, EVAS_IMAGE_CLASS);
@@ -630,7 +580,7 @@ _efl_canvas_image_efl_gfx_buffer_buffer_size_get(Eo
*eo_obj, Efl_Canvas_Image_Da
}
static Eina_Bool
-_image_pixels_set(Evas_Object_Protected_Data *obj, Efl_Canvas_Image_Data *pd,
+_image_pixels_set(Evas_Object_Protected_Data *obj,
Evas_Image_Data *o, void *pixels, int w, int h, int stride,
Efl_Gfx_Colorspace cspace, Eina_Bool copy)
{
@@ -639,9 +589,9 @@ _image_pixels_set(Evas_Object_Protected_Data *obj,
Efl_Canvas_Image_Data *pd,
// FIXME: buffer border support is not implemented
- if (pd->map_data->maps)
+ if (ENFN->image_data_maps_get(ENDT, o->engine_data, NULL, NULL) > 0)
{
- ERR("Can not call buffer_data_set after buffer_map.");
+ ERR("can not set pixels when there are open memory maps");
return EINA_FALSE;
}
@@ -770,29 +720,29 @@ end:
}
EOLIAN static Eina_Bool
-_efl_canvas_image_efl_gfx_buffer_buffer_data_set(Eo *eo_obj,
Efl_Canvas_Image_Data *pd,
+_efl_canvas_image_efl_gfx_buffer_buffer_data_set(Eo *eo_obj, void *_pd
EINA_UNUSED,
void *pixels, int w, int h,
int stride,
Efl_Gfx_Colorspace cspace)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj,
EVAS_OBJECT_CLASS);
Evas_Image_Data *o = eo_data_scope_get(eo_obj, EVAS_IMAGE_CLASS);
- return _image_pixels_set(obj, pd, o, pixels, w, h, stride, cspace,
EINA_FALSE);
+ return _image_pixels_set(obj, o, pixels, w, h, stride, cspace, EINA_FALSE);
}
EOLIAN static Eina_Bool
-_efl_canvas_image_efl_gfx_buffer_buffer_copy_set(Eo *eo_obj,
Efl_Canvas_Image_Data *pd,
+_efl_canvas_image_efl_gfx_buffer_buffer_copy_set(Eo *eo_obj, void *_pd
EINA_UNUSED,
const void *pixels, int w,
int h, int stride,
Efl_Gfx_Colorspace cspace)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj,
EVAS_OBJECT_CLASS);
Evas_Image_Data *o = eo_data_scope_get(eo_obj, EVAS_IMAGE_CLASS);
- return _image_pixels_set(obj, pd, o, (void *) pixels, w, h, stride, cspace,
EINA_TRUE);
+ return _image_pixels_set(obj, o, (void *) pixels, w, h, stride, cspace,
EINA_TRUE);
}
EOLIAN static void *
-_efl_canvas_image_efl_gfx_buffer_buffer_data_get(Eo *eo_obj,
Efl_Canvas_Image_Data *pd EINA_UNUSED)
+_efl_canvas_image_efl_gfx_buffer_buffer_data_get(Eo *eo_obj, void *_pd
EINA_UNUSED EINA_UNUSED)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj,
EVAS_OBJECT_CLASS);
Evas_Image_Data *o = eo_data_scope_get(eo_obj, EVAS_IMAGE_CLASS);
@@ -804,7 +754,7 @@ _efl_canvas_image_efl_gfx_buffer_buffer_data_get(Eo
*eo_obj, Efl_Canvas_Image_Da
}
EOLIAN static void *
-_efl_canvas_image_efl_gfx_buffer_buffer_map(Eo *eo_obj, Efl_Canvas_Image_Data
*pd,
+_efl_canvas_image_efl_gfx_buffer_buffer_map(Eo *eo_obj, void *_pd EINA_UNUSED,
int *length,
Efl_Gfx_Buffer_Access_Mode mode,
int x, int y, int w, int h,
@@ -813,8 +763,7 @@ _efl_canvas_image_efl_gfx_buffer_buffer_map(Eo *eo_obj,
Efl_Canvas_Image_Data *p
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj,
EVAS_OBJECT_CLASS);
Evas_Image_Data *o = eo_data_scope_get(eo_obj, EVAS_IMAGE_CLASS);
int len = 0, str = 0;
- Map_Data *map = NULL;
- void *data;
+ void *data = NULL;
if (!ENFN->image_data_map)
goto end; // not implemented
@@ -826,6 +775,9 @@ _efl_canvas_image_efl_gfx_buffer_buffer_map(Eo *eo_obj,
Efl_Canvas_Image_Data *p
goto end;
}
+ if (!w) w = o->cur->image.w;
+ if (!h) h = o->cur->image.h;
+
if ((x < 0) || (y < 0) || ((x + (int) w) > (int) o->cur->image.w) || ((y +
(int) h) > (int) o->cur->image.h))
{
ERR("Invalid map dimensions: %dx%d +%d,%d. Image is %dx%d.",
@@ -834,50 +786,27 @@ _efl_canvas_image_efl_gfx_buffer_buffer_map(Eo *eo_obj,
Efl_Canvas_Image_Data *p
}
data = ENFN->image_data_map(ENDT, &o->engine_data, &len, &str, x, y, w, h,
cspace, mode);
- if (data)
- {
- map = calloc(1, sizeof(*map));
- map->ptr = data;
- map->size = len;
- EINA_COW_WRITE_BEGIN(_map_data_cow, pd->map_data, Map_Data_Cow, mdata)
- mdata->maps = (Map_Data *)
eina_inlist_append(EINA_INLIST_GET(mdata->maps), EINA_INLIST_GET(map));
- EINA_COW_WRITE_END(_map_data_cow, pd->map_data, mdata);
- }
end:
if (length) *length = len;
if (stride) *stride = str;
- return map ? map->ptr : NULL;
+ return data;
}
-EOLIAN static void
-_efl_canvas_image_efl_gfx_buffer_buffer_unmap(Eo *eo_obj,
Efl_Canvas_Image_Data *pd,
+EOLIAN static Eina_Bool
+_efl_canvas_image_efl_gfx_buffer_buffer_unmap(Eo *eo_obj, void *_pd
EINA_UNUSED,
void *data, int length)
{
Evas_Object_Protected_Data *obj = eo_data_scope_get(eo_obj,
EVAS_OBJECT_CLASS);
Evas_Image_Data *o = eo_data_scope_get(eo_obj, EVAS_IMAGE_CLASS);
- Map_Data *map;
- if (!ENFN->image_data_unmap)
- goto fail; // not implemented
+ if (!ENFN->image_data_unmap || !o->engine_data)
+ return EINA_FALSE;
- if (!o->engine_data)
- goto fail;
-
- EINA_INLIST_FOREACH(pd->map_data->maps, map)
- if ((map->ptr == data) && (map->size == length))
- {
- EINA_COW_WRITE_BEGIN(_map_data_cow, pd->map_data, Map_Data_Cow,
mdata)
- mdata->maps = (Map_Data *)
eina_inlist_remove(EINA_INLIST_GET(mdata->maps), EINA_INLIST_GET(map));
- EINA_COW_WRITE_END(_map_data_cow, pd->map_data, mdata);
- o->engine_data = ENFN->image_data_unmap(ENDT, o->engine_data, data,
length);
- free(map);
- }
-
- return;
-
-fail:
- ERR("unmap failed");
+ if (!ENFN->image_data_unmap(ENDT, &o->engine_data, data, length))
+ return EINA_FALSE;
+
+ return EINA_TRUE;
}
#include "efl_canvas_image.eo.c"
diff --git a/src/lib/evas/canvas/efl_canvas_image.eo
b/src/lib/evas/canvas/efl_canvas_image.eo
index 8cececd..9f205ef 100644
--- a/src/lib/evas/canvas/efl_canvas_image.eo
+++ b/src/lib/evas/canvas/efl_canvas_image.eo
@@ -6,11 +6,8 @@ class Efl.Canvas.Image (Evas.Image, Efl.Gfx.Buffer,
Efl.Image_Load, Efl.Image_An
interfaces: file and data images only. This object does not implement
any special features such as proxy, snapshot or GL.
]]
+ data: null;
implements {
- class.constructor;
- class.destructor;
- Eo.Base.constructor;
- Eo.Base.destructor;
Efl.Gfx.Buffer.buffer_data_get;
Efl.Gfx.Buffer.buffer_data_set;
Efl.Gfx.Buffer.buffer_copy_set;
diff --git a/src/lib/evas/include/evas_private.h
b/src/lib/evas/include/evas_private.h
index 9c82ad3..92ef4b5 100644
--- a/src/lib/evas/include/evas_private.h
+++ b/src/lib/evas/include/evas_private.h
@@ -1362,7 +1362,8 @@ struct _Evas_Func
Eina_Bool (*image_can_region_get) (void *data, void *image);
void *(*image_data_map) (void *data, void **image, int
*length, int *stride, int x, int y, int w, int h, Evas_Colorspace cspace,
Efl_Gfx_Buffer_Access_Mode mode);
- void *(*image_data_unmap) (void *data, void *image, void
*map, int length);
+ Eina_Bool (*image_data_unmap) (void *data, void **image, void
*map, int length);
+ int (*image_data_maps_get) (void *data, void *image, void
**maps, int *lengths);
int (*image_native_init) (void *data,
Evas_Native_Surface_Type type);
void (*image_native_shutdown) (void *data,
Evas_Native_Surface_Type type);
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c
b/src/modules/evas/engines/software_generic/evas_engine.c
index 35bdf2a..1d43e78 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -1665,14 +1665,17 @@ _image_data_commit(RGBA_Image *im, RGBA_Image_Data_Map
*map)
}
}
-static void *
-eng_image_data_unmap(void *engdata EINA_UNUSED, void *image, void *memory, int
length)
+static Eina_Bool
+eng_image_data_unmap(void *engdata EINA_UNUSED, void **image, void *memory,
int length)
{
RGBA_Image_Data_Map *map;
- RGBA_Image *im = image;
+ RGBA_Image *im;
Eina_Bool found = EINA_FALSE;
- if (!im || !memory) return im;
+ if (!image || !*image || !memory)
+ return EINA_FALSE;
+
+ im = *image;
EINA_INLIST_FOREACH(EINA_INLIST_GET(im->maps), map)
{
@@ -1695,7 +1698,29 @@ eng_image_data_unmap(void *engdata EINA_UNUSED, void
*image, void *memory, int l
if (!found)
ERR("failed to unmap region %p (%u bytes)", memory, length);
- return im;
+ return found;
+}
+
+static int
+eng_image_data_maps_get(void *engdata EINA_UNUSED, void *image, void **maps,
int *lenghts)
+{
+ RGBA_Image_Data_Map *map;
+ RGBA_Image *im = image;
+ int k = 0;
+
+ if (!im) return -1;
+
+ if (!maps || !lenghts)
+ return eina_inlist_count(EINA_INLIST_GET(im->maps));
+
+ EINA_INLIST_FOREACH(EINA_INLIST_GET(im->maps), map)
+ {
+ maps[k] = map->ptr;
+ lenghts[k] = map->size;
+ k++;
+ }
+
+ return k;
}
static void
@@ -4395,6 +4420,7 @@ static Evas_Func func =
eng_image_can_region_get,
eng_image_data_map,
eng_image_data_unmap,
+ eng_image_data_maps_get,
eng_image_native_init,
eng_image_native_shutdown,
eng_image_native_set,
--
