hermet pushed a commit to branch master. http://git.enlightenment.org/tools/expedite.git/commit/?id=525879533ad1ae9b7e4ae4857d08378636ccf2f1
commit 525879533ad1ae9b7e4ae4857d08378636ccf2f1 Author: Subhransu Mohanty <[email protected]> Date: Mon Oct 10 14:09:23 2016 +0900 fixed the build break because of api change. Summary: NOTE: need to check if the api replacements are correct or not Reviewers: Hermet, jpeg Differential Revision: https://phab.enlightenment.org/D4329 --- src/bin/image_data_argb.c | 18 +++++++++++------- src/bin/image_data_argb_alpha.c | 18 ++++++++++-------- src/bin/image_data_ycbcr601pl.c | 2 +- .../image_data_ycbcr601pl_map_nearest_solid_rotate.c | 5 ++++- src/bin/image_data_ycbcr601pl_map_solid_rotate.c | 5 ++++- src/bin/image_data_ycbcr601pl_wide_stride.c | 7 +++++-- 6 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/bin/image_data_argb.c b/src/bin/image_data_argb.c index b96ab75..5707f36 100644 --- a/src/bin/image_data_argb.c +++ b/src/bin/image_data_argb.c @@ -23,6 +23,7 @@ static void _setup(void) int i; Evas_Object *o; void *pixels; + Eina_Slice slice; pixels = malloc(sizeof (int) * 640 * 480); for (i = 0; i < 1; i++) @@ -34,7 +35,8 @@ static void _setup(void) efl_gfx_fill_set(o, 0, 0, 640, 480); efl_gfx_size_set(o, 640, 480); efl_gfx_visible_set(o, EINA_TRUE); - efl_gfx_buffer_copy_set(o_images[i], pixels, 640, 480, 640 * sizeof (int), EFL_GFX_COLORSPACE_ARGB8888); + slice = (Eina_Slice)EINA_SLICE_STR(pixels); + efl_gfx_buffer_copy_set(o_images[i], &slice, 640, 480, 640 * sizeof (int), EFL_GFX_COLORSPACE_ARGB8888, 0); } free(pixels); done = 0; @@ -52,9 +54,11 @@ static void _loop(double t, int f) { int i, st; Evas_Coord x, y, w, h; + Eina_Rw_Slice rw_slice; + for (i = 0; i < 1; i++) { - unsigned int *data, *p; + unsigned int result, *p; int length; w = 640; @@ -64,17 +68,17 @@ static void _loop(double t, int f) efl_gfx_position_set(o_images[i], x, y); efl_gfx_size_set(o_images[i], w, h); efl_gfx_fill_set(o_images[i], 0, 0, w, h); - data = efl_gfx_buffer_map(o_images[i], &length, + result = efl_gfx_buffer_map(o_images[i], &rw_slice, EFL_GFX_BUFFER_ACCESS_MODE_WRITE, - 0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888, + 0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888, 0, &st); - if (!data) + if (!result) { fprintf(stderr, "ERROR: Failed to map image!\n"); continue; } st = st >> 2; - p = data; + p = rw_slice.mem; for (y = 0; y < h; y++) { for (x = 0; x < w; x++) @@ -84,7 +88,7 @@ static void _loop(double t, int f) } p += (st - w); } - efl_gfx_buffer_unmap(o_images[i], data, length); + efl_gfx_buffer_unmap(o_images[i], &rw_slice); efl_gfx_buffer_update_add(o_images[i], 0, 0, w, h); } FPS_STD(NAME); diff --git a/src/bin/image_data_argb_alpha.c b/src/bin/image_data_argb_alpha.c index 0493c95..a4cdabe 100644 --- a/src/bin/image_data_argb_alpha.c +++ b/src/bin/image_data_argb_alpha.c @@ -34,7 +34,7 @@ static void _setup(void) efl_gfx_fill_set(o, 0, 0, 640, 480); efl_gfx_size_set(o, 640, 480); efl_gfx_visible_set(o, EINA_TRUE); - efl_gfx_buffer_copy_set(o_images[i], pixels, 640, 480, 640 * sizeof (int), EFL_GFX_COLORSPACE_ARGB8888); + efl_gfx_buffer_copy_set(o_images[i], pixels, 640, 480, 640 * sizeof (int), EFL_GFX_COLORSPACE_ARGB8888, 0); } free(pixels); done = 0; @@ -52,10 +52,12 @@ static void _loop(double t, int f) { int i, st; Evas_Coord x, y, w, h; + Eina_Rw_Slice rw_slice; + for (i = 0; i < 1; i++) { - unsigned int *data, *p; - int a, r, g, b, length; + unsigned int result, *p; + int a, r, g, b; w = 640; h = 480; @@ -64,17 +66,17 @@ static void _loop(double t, int f) efl_gfx_position_set(o_images[i], x, y); efl_gfx_size_set(o_images[i], w, h); efl_gfx_fill_set(o_images[i], 0, 0, w, h); - data = efl_gfx_buffer_map(o_images[i], &length, + result = efl_gfx_buffer_map(o_images[i], &rw_slice, EFL_GFX_BUFFER_ACCESS_MODE_WRITE, - 0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888, + 0, 0, 0, 0, EFL_GFX_COLORSPACE_ARGB8888, 0, &st); - if (!data) + if (!result) { fprintf(stderr, "ERROR: Failed to map image!\n"); continue; } st = st >> 2; - p = data; + p = rw_slice.mem; for (y = 0; y < h; y++) { for (x = 0; x < w; x++) @@ -95,7 +97,7 @@ static void _loop(double t, int f) } p += (st - w); } - efl_gfx_buffer_unmap(o_images[i], data, length); + efl_gfx_buffer_unmap(o_images[i], &rw_slice); efl_gfx_buffer_update_add(o_images[i], 0, 0, w, h); } FPS_STD(NAME); diff --git a/src/bin/image_data_ycbcr601pl.c b/src/bin/image_data_ycbcr601pl.c index 2138de3..c2ca581 100644 --- a/src/bin/image_data_ycbcr601pl.c +++ b/src/bin/image_data_ycbcr601pl.c @@ -63,7 +63,7 @@ static void _setup(void) *lp = vp + (y * 320); lp++; } - efl_gfx_buffer_copy_set(o_images[i], data, 640, 480, 640 * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL); + efl_gfx_buffer_copy_set(o_images[i], data, 640, 480, 640 * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL, 0); free(data); // Not a real copy in fact... /* free(yp); */ diff --git a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c index 3dee9f8..7413d9f 100644 --- a/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c +++ b/src/bin/image_data_ycbcr601pl_map_nearest_solid_rotate.c @@ -25,6 +25,8 @@ static void _setup(void) FILE *f; unsigned char **data, **lp; Evas_Object *o; + Eina_Slice slice; + for (i = 0; i < 1; i++) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); @@ -63,7 +65,8 @@ static void _setup(void) *lp = vp + (y * 320); lp++; } - efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL); + slice = (Eina_Slice)EINA_SLICE_STR(*data); + efl_gfx_buffer_managed_set(o_images[i], &slice, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, 0); free(yp); free(up); free(vp); diff --git a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c index 8c936f6..af45b33 100644 --- a/src/bin/image_data_ycbcr601pl_map_solid_rotate.c +++ b/src/bin/image_data_ycbcr601pl_map_solid_rotate.c @@ -25,6 +25,8 @@ static void _setup(void) FILE *f; unsigned char **data, **lp; Evas_Object *o; + Eina_Slice slice; + for (i = 0; i < 1; i++) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); @@ -62,7 +64,8 @@ static void _setup(void) *lp = vp + (y * 320); lp++; } - efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL); + slice = (Eina_Slice)EINA_SLICE_STR(*data); + efl_gfx_buffer_managed_set(o_images[i], &slice, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, 0); free(yp); free(up); free(vp); diff --git a/src/bin/image_data_ycbcr601pl_wide_stride.c b/src/bin/image_data_ycbcr601pl_wide_stride.c index b7a4396..c9eeb14 100644 --- a/src/bin/image_data_ycbcr601pl_wide_stride.c +++ b/src/bin/image_data_ycbcr601pl_wide_stride.c @@ -25,6 +25,8 @@ static void _setup(void) FILE *f; unsigned char **data, **lp; Evas_Object *o; + Eina_Slice slice; + for (i = 0; i < 1; i++) { o = efl_add(EFL_CANVAS_IMAGE_CLASS, evas); @@ -62,7 +64,8 @@ static void _setup(void) *lp = vp + (y * 320); lp++; } - efl_gfx_buffer_data_set(o_images[i], data, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL); + slice = (Eina_Slice)EINA_SLICE_STR(*data); + efl_gfx_buffer_managed_set(o_images[i], &slice, 640, 480, 0, EFL_GFX_COLORSPACE_YCBCR422P601_PL, 0); efl_gfx_buffer_update_add(o_images[i], 0, 0, 320, 480); free(yp); free(up); @@ -122,7 +125,7 @@ static void _loop(double t, int f) lp++; } - efl_gfx_buffer_copy_set(o_images[i], data, w, 480, w * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL); + efl_gfx_buffer_copy_set(o_images[i], data, w, 480, w * sizeof (int), EVAS_COLORSPACE_YCBCR422P601_PL, 0); efl_gfx_buffer_update_add(o_images[i], 0, 0, w, 480); free(data); } --
