[EGIT] [core/enlightenment] master 01/01: e - fix compositor fade out ghosting
raster pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=251daa75154a8eaac07e3f9af9c1028999ddd33d commit 251daa75154a8eaac07e3f9af9c1028999ddd33d Author: Carsten Haitzler (Rasterman)Date: Mon Nov 23 11:42:38 2015 +0900 e - fix compositor fade out ghosting due to enabling manual rendering (and als animator frametiem to 10 secons) in e_comp_canvas.c when screensaver is active (blanking is finished totallly - eg the fade to black) evas weill nto render the last frame of the animation - skipping it and not rendering another update until screensaver is disabled. this leaves a subtle ghost of pixel data which is 1 step before black on the screen (until dpms turns the monitor off). this fixes that. this delays enabling manual render for 1 more second after we have been told the screensaver is active. this is plenty of time to update all the way to black. @fix --- src/bin/e_comp_canvas.c | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/bin/e_comp_canvas.c b/src/bin/e_comp_canvas.c index 97a2edc..a3d8401 100644 --- a/src/bin/e_comp_canvas.c +++ b/src/bin/e_comp_canvas.c @@ -2,12 +2,14 @@ static Eina_List *handlers; static Ecore_Timer *timer_post_screensaver_lock = NULL; +static Ecore_Timer *timer_post_screensaver_on = NULL; static void _e_comp_canvas_cb_del() { E_FREE_LIST(handlers, ecore_event_handler_del); E_FREE_FUNC(timer_post_screensaver_lock, ecore_timer_del); + E_FREE_FUNC(timer_post_screensaver_on, ecore_timer_del); } static void @@ -155,13 +157,23 @@ _e_comp_cb_zone_change() -static void -_e_comp_canvas_screensaver_active(void *d EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED) +static Eina_Bool +_e_comp_cb_screensaver_active_delay(void *data EINA_UNUSED) { - /* thawed in _e_comp_screensaver_off() */ ecore_animator_frametime_set(10.0); if (!e_comp->nocomp) ecore_evas_manual_render_set(e_comp->ee, EINA_TRUE); + timer_post_screensaver_on = NULL; + return ECORE_CALLBACK_CANCEL; +} + +static void +_e_comp_canvas_screensaver_active(void *d EINA_UNUSED, Evas_Object *obj EINA_UNUSED, const char *sig EINA_UNUSED, const char *src EINA_UNUSED) +{ + if (timer_post_screensaver_on) return; + /* thawed in _e_comp_screensaver_off() */ + timer_post_screensaver_on = ecore_timer_add + (1.0, _e_comp_cb_screensaver_active_delay, NULL); } static Eina_Bool @@ -192,6 +204,7 @@ static Eina_Bool _e_comp_cb_screensaver_off() { E_FREE_FUNC(timer_post_screensaver_lock, ecore_timer_del); + E_FREE_FUNC(timer_post_screensaver_on, ecore_timer_del); return ECORE_CALLBACK_PASS_ON; } --
[EGIT] [core/efl] master 02/10: eina: test case for base64 encoding function.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=11a4db12612ce885d9f3efa7e69fc5b81267a429 commit 11a4db12612ce885d9f3efa7e69fc5b81267a429 Author: Srivardhan HebbarDate: Fri Nov 20 02:44:07 2015 +0100 eina: test case for base64 encoding function. Summary: Signed-off-by: Srivardhan Hebbar Reviewers: cedric Differential Revision: https://phab.enlightenment.org/D3229 Signed-off-by: Cedric BAIL --- src/tests/eina/eina_test_str.c | 50 ++ 1 file changed, 50 insertions(+) diff --git a/src/tests/eina/eina_test_str.c b/src/tests/eina/eina_test_str.c index 97b3865..d4fc5e1 100644 --- a/src/tests/eina/eina_test_str.c +++ b/src/tests/eina/eina_test_str.c @@ -365,6 +365,55 @@ START_TEST(str_strftime) } END_TEST +START_TEST(str_base64_encode) +{ + /* All cases are taken from https://en.wikipedia.org/wiki/Base64 */ + + unsigned char *str = (unsigned char *)"any carnal pleasure."; + char *encoded; + + encoded = eina_str_base64_encode(str, 20); + fail_unless(strcmp(encoded, "YW55IGNhcm5hbCBwbGVhc3VyZS4=")); + free(encoded); + + encoded = eina_str_base64_encode(str, 19); + fail_unless(strcmp(encoded, "YW55IGNhcm5hbCBwbGVhc3VyZQ==")); + free(encoded); + + encoded = eina_str_base64_encode(str, 18); + fail_unless(strcmp(encoded, "YW55IGNhcm5hbCBwbGVhc3Vy")); + free(encoded); + + encoded = eina_str_base64_encode(str, 17); + fail_unless(strcmp(encoded, "YW55IGNhcm5hbCBwbGVhc3U=")); + free(encoded); + + encoded = eina_str_base64_encode(str, 16); + fail_unless(strcmp(encoded, "YW55IGNhcm5hbCBwbGVhcw==")); + free(encoded); + + encoded = eina_str_base64_encode((unsigned char *)"pleasure.", 9); + fail_unless(strcmp(encoded, "cGxlYXN1cmUu")); + free(encoded); + + encoded = eina_str_base64_encode((unsigned char *)"leasure.", 8); + fail_unless(strcmp(encoded, "bGVhc3VyZS4=")); + free(encoded); + + encoded = eina_str_base64_encode((unsigned char *)"easure.", 7); + fail_unless(strcmp(encoded, "ZWFzdXJlLg==")); + free(encoded); + + encoded = eina_str_base64_encode((unsigned char *)"asure.", 6); + fail_unless(strcmp(encoded, "YXN1cmUu")); + free(encoded); + + encoded = eina_str_base64_encode((unsigned char *)"sure.", 5); + fail_unless(strcmp(encoded, "YXN1cmUu")); + free(encoded); +} +END_TEST + #ifdef HAVE_ICONV START_TEST(str_convert) { @@ -404,6 +453,7 @@ eina_test_str(TCase *tc) tcase_add_test(tc, str_join_len); tcase_add_test(tc, str_memdup); tcase_add_test(tc, str_strftime); + tcase_add_test(tc, str_base64_encode); #ifdef HAVE_ICONV tcase_add_test(tc, str_convert); #endif --
[EGIT] [core/efl] master 10/10: evas: fix PLY loader and saver.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=bcf38c58174406299b02d94e49c29e05f1bc58b1 commit bcf38c58174406299b02d94e49c29e05f1bc58b1 Author: perepelits.mDate: Mon Nov 23 08:28:24 2015 +0100 evas: fix PLY loader and saver. Summary: Use less memory by indexation vertices and not keeping more than one copy of it (from task T2713). [Fix] Reviewers: cedric, raster, Hermet Subscribers: artem.popov Differential Revision: https://phab.enlightenment.org/D3355 Signed-off-by: Cedric BAIL --- .../evas/model_loaders/ply/evas_model_load_ply.c | 125 +++-- .../evas/model_savers/ply/evas_model_save_ply.c| 9 +- 2 files changed, 70 insertions(+), 64 deletions(-) diff --git a/src/modules/evas/model_loaders/ply/evas_model_load_ply.c b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c index ad56abc..78b2918 100644 --- a/src/modules/evas/model_loaders/ply/evas_model_load_ply.c +++ b/src/modules/evas/model_loaders/ply/evas_model_load_ply.c @@ -103,6 +103,7 @@ _read_header(char *map)//Check properties of mesh in .ply file. sscanf(helping_pointer[1], "%d", _count); +ERR("\n HEADER %d", header.vertices_count); free(helping_pointer); helping_pointer = eina_str_split(map, "end_header\n", 0); @@ -181,7 +182,7 @@ void evas_model_load_file_ply(Evas_Canvas3D_Mesh *mesh, Eina_File *file) { Evas_Canvas3D_Mesh_Data *pd; - int i = 0, j = 0, k = 0, count_of_triangles_in_line = 0; + int i = 0, j = 0, count_of_triangles_in_line = 0; float *pos, *nor, *tex, *col; int stride_pos, stride_nor, stride_tex, stride_col; char *current, *map; @@ -223,20 +224,20 @@ evas_model_load_file_ply(Evas_Canvas3D_Mesh *mesh, Eina_File *file) _tex_coords_ply = malloc(header.vertices_count * 2 * sizeof(float)); if (header.existence_of_colors) _colors_ply = malloc(header.vertices_count * 3 * sizeof(float)); - int *_triangles = malloc(header.triangles_count * 3 * sizeof(int)); + unsigned short *_indices = malloc(header.triangles_count * 3 * sizeof(unsigned short)); if ((header.existence_of_geometries && (_vertices_ply == NULL)) || (header.existence_of_normals && (_normals_ply == NULL)) || (header.existence_of_texcoords && (_tex_coords_ply == NULL)) || (header.existence_of_colors && (_colors_ply == NULL)) || - (_triangles == NULL)) + (_indices == NULL)) { ERR("Allocate memory is failed."); free(_vertices_ply); free(_normals_ply); free(_tex_coords_ply); free(_colors_ply); -free(_triangles); +free(_indices); return; } @@ -252,30 +253,30 @@ evas_model_load_file_ply(Evas_Canvas3D_Mesh *mesh, Eina_File *file) current = _to_begin_of_line(current); } - for (i = 0; i < header.triangles_count;) + for (i = 0; i < header.triangles_count * 3;) { sscanf (current,"%d", _of_triangles_in_line); count_of_triangles_in_line -= 2; current = _to_next_number(current, 1); -sscanf (current,"%i", _2D(_triangles, i, 0, 3)); +sscanf (current,"%hu", _indices + i); for (j = 0; j < count_of_triangles_in_line; j++) { if (j > 0) - ARRAY_2D(_triangles, i, 0, 3) = ARRAY_2D(_triangles, (i - 1), 0, 3); + _indices[i] = _indices[i - 3]; current = _to_next_number(current, 1); - sscanf (current,"%i %i", - _2D(_triangles, i, 1, 3), - _2D(_triangles, i, 2, 3)); - i++; + sscanf (current,"%hu %hu", + _indices + i + 1, + _indices + i + 2); + i+=3; } current = _to_next_line(current); } /* prepare of mesh and take pointers to data which must be read */ eo_do(mesh, - evas_canvas3d_mesh_vertex_count_set(header.triangles_count * 3), + evas_canvas3d_mesh_vertex_count_set(header.vertices_count), evas_canvas3d_mesh_vertex_assembly_set(EVAS_CANVAS3D_VERTEX_ASSEMBLY_TRIANGLES), evas_canvas3d_mesh_frame_add(0), evas_canvas3d_mesh_frame_vertex_data_copy_set(0, EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL), @@ -298,62 +299,66 @@ evas_model_load_file_ply(Evas_Canvas3D_Mesh *mesh, Eina_File *file) if (stride_tex == 0) stride_tex = sizeof(float) * 2; if (stride_col == 0) stride_col = sizeof(float) * 4; - for (j = 0; j < header.triangles_count; j++) + + for (j = 0; j < header.vertices_count; j++) { -for (k = 0; k < 3; k++) - { - float *p, *n, *t, *c; +float *p, *n, *t, *c; - p = (float *)((char *)pos + stride_pos * (j * 3 + k)); - n = (float *)((char *)nor + stride_nor * (j * 3 + k)); - t
[EGIT] [core/efl] master 06/10: evas: fix unreachable code in _generate_unic_color_key function in Evas.Canvas3D.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5d4f3b22c4212b755a881098bf28e5ee02a1a124 commit 5d4f3b22c4212b755a881098bf28e5ee02a1a124 Author: Oleksandr ShcherbinaDate: Mon Nov 23 08:11:27 2015 +0100 evas: fix unreachable code in _generate_unic_color_key function in Evas.Canvas3D. Summary: Have a sence. It is hard to assume that more that 16 million color will be used. @fix CID: 1339790 Reviewers: raster, cedric Reviewed By: cedric Differential Revision: https://phab.enlightenment.org/D3347 Signed-off-by: Cedric BAIL --- src/lib/evas/canvas/evas_canvas3d_node.c | 6 -- 1 file changed, 6 deletions(-) diff --git a/src/lib/evas/canvas/evas_canvas3d_node.c b/src/lib/evas/canvas/evas_canvas3d_node.c index ef0a96d..cbfbb84 100644 --- a/src/lib/evas/canvas/evas_canvas3d_node.c +++ b/src/lib/evas/canvas/evas_canvas3d_node.c @@ -41,12 +41,6 @@ _generate_unic_color_key(Evas_Color *color, Evas_Color *bg_color, Evas_Canvas3D_ GET_NEXT_COLOR } - if ((red == 255) && (green == 255) && (blue == 255)) - { -ERR("Overfill number of color. %d %s", __LINE__, __FILE__); -red = green = blue = 0; - } - color->r = (double)red / 255; color->g = (double)green / 255; color->b = (double)blue / 255; --
[EGIT] [core/elementary] master 02/04: multibuttonentry: internal entry cnp mode set as "ELM_CNP_MODE_PLAINTEXT".
cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=df72227b7f4d927ae9d9007f158f14583e7a41f4 commit df72227b7f4d927ae9d9007f158f14583e7a41f4 Author: woochan leeDate: Mon Nov 23 07:50:17 2015 +0100 multibuttonentry: internal entry cnp mode set as "ELM_CNP_MODE_PLAINTEXT". Summary: To prevent pasted markup text in entry. User want tags removed text when paste text into entry. @fix Reviewers: jaehwan, Hermet, cedric Reviewed By: cedric Differential Revision: https://phab.enlightenment.org/D Signed-off-by: Cedric BAIL --- src/lib/elc_multibuttonentry.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c index bd2bbc4..23b98e8 100644 --- a/src/lib/elc_multibuttonentry.c +++ b/src/lib/elc_multibuttonentry.c @@ -1431,6 +1431,7 @@ _view_init(Evas_Object *obj, Elm_Multibuttonentry_Data *sd) sd->entry = elm_entry_add(obj); if (!sd->entry) return; elm_entry_single_line_set(sd->entry, EINA_TRUE); + elm_entry_cnp_mode_set(sd->entry, ELM_CNP_MODE_PLAINTEXT); elm_object_text_set(sd->entry, ""); elm_entry_input_panel_enabled_set(sd->entry, EINA_FALSE); evas_object_size_hint_min_set(sd->entry, MIN_W_ENTRY, 0); --
[EGIT] [core/elementary] master 03/04: datetime: fix field arrange code for dynamically field sequence change case.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=f48bbb1856590d8d12d34181fab34d9bbec970e1 commit f48bbb1856590d8d12d34181fab34d9bbec970e1 Author: woochan leeDate: Mon Nov 23 08:00:45 2015 +0100 datetime: fix field arrange code for dynamically field sequence change case. Summary: This is for support dynamically field sequence changing case for example User sets datetime format as "%d/%b/%y" first. Then change the format dynamically in runtime to "%I:%M %p" Previous format datetime items still there. It breaks view(object dulicated on same geometry) @fix Test Plan: Run datetime sample. Add changed callback. Change format in changed callback function. Check the bug state. Reviewers: jaehwan, id213sin, Hermet, cedric Reviewed By: cedric Differential Revision: https://phab.enlightenment.org/D3340 Signed-off-by: Cedric BAIL --- src/lib/elm_datetime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_datetime.c b/src/lib/elm_datetime.c index ccd14f3..9d1d2f4 100644 --- a/src/lib/elm_datetime.c +++ b/src/lib/elm_datetime.c @@ -231,7 +231,7 @@ _field_list_arrange(Evas_Object *obj) if (field->visible && field->fmt_exist) { - elm_layout_content_unset(obj, buf); + evas_object_hide(elm_layout_content_unset(obj, buf)); elm_layout_content_set(obj, buf, field->item_obj); } else --
[EGIT] [core/efl] master 07/10: evas: fix possible accsess to NULL pointer in Evas.Canvas3d.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=6866d256e8df02e99bd4a17030703372cdb2c8b7 commit 6866d256e8df02e99bd4a17030703372cdb2c8b7 Author: Oleksandr ShcherbinaDate: Mon Nov 23 08:15:41 2015 +0100 evas: fix possible accsess to NULL pointer in Evas.Canvas3d. Summary: @fix CID:1339784 Reviewers: raster, cedric Reviewed By: cedric Differential Revision: https://phab.enlightenment.org/D3348 Signed-off-by: Cedric BAIL --- src/lib/evas/canvas/evas_canvas3d_mesh.c | 7 +++ 1 file changed, 7 insertions(+) diff --git a/src/lib/evas/canvas/evas_canvas3d_mesh.c b/src/lib/evas/canvas/evas_canvas3d_mesh.c index f6d91f1..ead3da0 100644 --- a/src/lib/evas/canvas/evas_canvas3d_mesh.c +++ b/src/lib/evas/canvas/evas_canvas3d_mesh.c @@ -1132,6 +1132,13 @@ _evas_canvas3d_mesh_convex_hull_data_get(Eo *obj EINA_UNUSED, Evas_Canvas3D_Mesh int stride; Evas_Canvas3D_Mesh_Frame *f = evas_canvas3d_mesh_frame_find(pd, frame); + + if (!f) + { +ERR("Not existing mesh frame %d %s", __LINE__, __FILE__); +return; + } + if (f->vertices[EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION].stride != 0) stride = f->vertices[EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION].stride / sizeof(float); else --
[EGIT] [core/elementary] master 04/04: theme: add DBG() message when style is set to default (fallback)
cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=a21a8181c2fa4f43e17eb30178b386208eb7d9f5 commit a21a8181c2fa4f43e17eb30178b386208eb7d9f5 Author: Jee-Yong UmDate: Mon Nov 23 08:26:52 2015 +0100 theme: add DBG() message when style is set to default (fallback) Summary: When _elm_theme_set() failed to set given style, it sets style as "default". However, setting style to "default" can be unintended behavior, so developer should have the chance to get to know fallback. Reviewers: cedric Reviewed By: cedric Differential Revision: https://phab.enlightenment.org/D3352 Signed-off-by: Cedric BAIL --- src/lib/elm_theme.c | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/lib/elm_theme.c b/src/lib/elm_theme.c index 87048fe..4006bc6 100644 --- a/src/lib/elm_theme.c +++ b/src/lib/elm_theme.c @@ -319,7 +319,12 @@ _elm_theme_set(Elm_Theme *th, Evas_Object *o, const char *clas, const char *grou file = _elm_theme_group_file_find(th, buf2); if (file) { - if (edje_object_mmap_set(o, file, buf2)) return EINA_TRUE; + if (edje_object_mmap_set(o, file, buf2)) + { + DBG("could not set theme style '%s', fallback to default", + style); + return EINA_TRUE; + } else { DBG("could not set theme group '%s' from file '%s': %s", --
[EGIT] [core/efl] master 01/10: eina: added bounds_get api to Eina_Bezier
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=07bb5483b4acc0bc3ded4ccb7d61a24e545a2ff8 commit 07bb5483b4acc0bc3ded4ccb7d61a24e545a2ff8 Author: Subhransu MohantyDate: Tue Nov 10 13:22:19 2015 +0900 eina: added bounds_get api to Eina_Bezier Signed-off-by: Cedric BAIL --- src/lib/eina/eina_bezier.c| 40 +++ src/lib/eina/eina_bezier.h| 14 ++ src/tests/eina/eina_test_bezier.c | 21 3 files changed, 75 insertions(+) diff --git a/src/lib/eina/eina_bezier.c b/src/lib/eina/eina_bezier.c index 4e8ffca..f07ca61 100644 --- a/src/lib/eina/eina_bezier.c +++ b/src/lib/eina/eina_bezier.c @@ -273,3 +273,43 @@ eina_bezier_split_at_length(const Eina_Bezier *b, double len, t = eina_bezier_t_at(right, len); _eina_bezier_split_left(right, t, left); } + +EAPI void +eina_bezier_bounds_get(const Eina_Bezier *b, double *x, double *y, double *w, double *h) +{ + double xmin = b->start.x; + double xmax = b->start.x; + double ymin = b->start.y; + double ymax = b->start.y; + + if (b->ctrl_start.x < xmin) + xmin = b->ctrl_start.x; + else if (b->ctrl_start.x > xmax) + xmax = b->ctrl_start.x; + if (b->ctrl_end.x < xmin) + xmin = b->ctrl_end.x; + else if (b->ctrl_end.x > xmax) + xmax = b->ctrl_end.x; + if (b->end.x < xmin) + xmin = b->end.x; + else if (b->end.x > xmax) + xmax = b->end.x; + + if (b->ctrl_start.y < ymin) + ymin = b->ctrl_start.y; + else if (b->ctrl_start.y > ymax) + ymax = b->ctrl_start.y; + if (b->ctrl_end.y < ymin) + ymin = b->ctrl_end.y; + else if (b->ctrl_end.y > ymax) + ymax = b->ctrl_end.y; + if (b->end.y < ymin) + ymin = b->end.y; + else if (b->end.y > ymax) + ymax = b->end.y; + + if (x) *x = xmin; + if (y) *y = ymin; + if (w) *w = xmax - xmin; + if (h) *h = ymax - ymin; +} diff --git a/src/lib/eina/eina_bezier.h b/src/lib/eina/eina_bezier.h index aef32e4..407deb5 100644 --- a/src/lib/eina/eina_bezier.h +++ b/src/lib/eina/eina_bezier.h @@ -143,4 +143,18 @@ EAPI double eina_bezier_angle_at(const Eina_Bezier *b, double t) EINA_ARG_NONNUL */ EAPI void eina_bezier_split_at_length(const Eina_Bezier *b, double len, Eina_Bezier *left, Eina_Bezier *right) EINA_ARG_NONNULL(1); +/** + * @brief get the bound of the the bezier. + * + * @param b The floating point bezier. + * @param x x coordinate of bounding box. + * @param y y coordinate of bounding box. + * @param w width of bounding box. + * @param h height of bounding box. + * + * @p b. No check is done on @p b. + * @since 1.16 + */ +EAPI void eina_bezier_bounds_get(const Eina_Bezier *b, double *x, double *y, double *w, double *h) EINA_ARG_NONNULL(1); + #endif // EINA_BEZIER_H diff --git a/src/tests/eina/eina_test_bezier.c b/src/tests/eina/eina_test_bezier.c index a7ad8f2..fdfd9a3 100644 --- a/src/tests/eina/eina_test_bezier.c +++ b/src/tests/eina/eina_test_bezier.c @@ -175,6 +175,26 @@ START_TEST(eina_bezier_test_split_at_length) } END_TEST +START_TEST(eina_bezier_test_bounds_get) +{ + Eina_Bezier b; + double x, y, w, h; + + eina_init(); + eina_bezier_values_set(, + 0, 0, + 100, 0, + 0, 100, + 100, 100); + + eina_bezier_bounds_get(, , , , ); + + fail_if(x !=0 || y!=0 || w !=100 || h !=100 ); + + eina_shutdown(); +} +END_TEST + void eina_test_bezier(TCase *tc) { @@ -184,4 +204,5 @@ eina_test_bezier(TCase *tc) tcase_add_test(tc, eina_bezier_test_t_at); tcase_add_test(tc, eina_bezier_test_point_at); tcase_add_test(tc, eina_bezier_test_split_at_length); + tcase_add_test(tc, eina_bezier_test_bounds_get); } --
[EGIT] [core/efl] master 05/10: evil: fix uninitialize warning
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=01f13181175bfe1d0aefde8877efccd25f628f42 commit 01f13181175bfe1d0aefde8877efccd25f628f42 Author: Vivek EllurDate: Fri Nov 20 05:52:56 2015 +0100 evil: fix uninitialize warning Summary: @Fix Signed-off-by: Vivek Ellur Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D3324 Signed-off-by: Cedric BAIL --- src/bin/evil/evil_test_pipe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/evil/evil_test_pipe.c b/src/bin/evil/evil_test_pipe.c index 54b68b2..e5cfdec 100644 --- a/src/bin/evil/evil_test_pipe.c +++ b/src/bin/evil/evil_test_pipe.c @@ -45,7 +45,7 @@ test_pipe_test(void) intsockets[2]; struct timeval t; fd_set rfds; - intret; + intret = 0; data *d; DWORD thread_id; HANDLE h; --
[EGIT] [core/efl] master 08/10: evas: fix uninitialize variable in convex_hull_vertex_set function
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=3a56b3f01391771206c7ee274817a86ca88d38c6 commit 3a56b3f01391771206c7ee274817a86ca88d38c6 Author: Oleksandr ShcherbinaDate: Mon Nov 23 08:18:51 2015 +0100 evas: fix uninitialize variable in convex_hull_vertex_set function Summary: A bit of useless claim, becouse parameter coord always have value 0 or 1 or 2. May be for escape problem in future. @fix CID: 1339781 Reviewers: raster, cedric Reviewed By: cedric Differential Revision: https://phab.enlightenment.org/D3349 Signed-off-by: Cedric BAIL --- src/lib/evas/include/evas_3d_utils.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/evas/include/evas_3d_utils.h b/src/lib/evas/include/evas_3d_utils.h index 23d338d..7c9b34e 100644 --- a/src/lib/evas/include/evas_3d_utils.h +++ b/src/lib/evas/include/evas_3d_utils.h @@ -1578,7 +1578,7 @@ convex_hull_vertex_set(Evas_Triangle3 *el, unsigned short int *vertex_count, flo unsigned short int **index, unsigned int k, int *leader, int coord) { int color_coords, normal_coords; - Evas_Vec3 vect; + Evas_Vec3 vect = {0}; switch (coord) { case 0: @@ -1904,7 +1904,7 @@ evas_convex_hull_get(float *data, int count, int stride, Eina_Inarray *vertex, on_plain = EINA_FALSE; right = EINA_FALSE; -/* The case when several points are found, is discussed below. +/* The case when several points are found, is discussed below. This case is interesting because the convex hull in the two-dimensional subspace should be filled further */ if ((cos != 1.0) && (1 < eina_array_count(_candidates))) --
[EGIT] [core/elementary] master 01/04: multibuttonentry: change default format count.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=f863d98c6083958438498873a542a59a4be0ec54 commit f863d98c6083958438498873a542a59a4be0ec54 Author: woochan leeDate: Mon Nov 23 07:48:32 2015 +0100 multibuttonentry: change default format count. Summary: There is no need ellipsis, space as well before "%d". The "%d" will show the actual invisible item count. @fix Reviewers: jaehwan, Hermet, cedric Reviewed By: cedric Differential Revision: https://phab.enlightenment.org/D3332 Signed-off-by: Cedric BAIL --- src/lib/elc_multibuttonentry.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c index 3b4a2db..bd2bbc4 100644 --- a/src/lib/elc_multibuttonentry.c +++ b/src/lib/elc_multibuttonentry.c @@ -83,7 +83,7 @@ _format_count(int count, void *data EINA_UNUSED) { char buf[32]; - if (!snprintf(buf, sizeof(buf), "... + %d", count)) return NULL; + if (!snprintf(buf, sizeof(buf), "+%d", count)) return NULL; return strdup(buf); } --
[EGIT] [core/efl] master 03/10: eina: example for base64 encoding.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f371eb538870c82969f8f7344708a899b8b03956 commit f371eb538870c82969f8f7344708a899b8b03956 Author: Srivardhan HebbarDate: Fri Nov 20 02:45:39 2015 +0100 eina: example for base64 encoding. Summary: Depends on D3228 Signed-off-by: Srivardhan Hebbar Reviewers: cedric Differential Revision: https://phab.enlightenment.org/D3230 Signed-off-by: Cedric BAIL --- src/examples/eina/eina_str_01.c | 5 + 1 file changed, 5 insertions(+) diff --git a/src/examples/eina/eina_str_01.c b/src/examples/eina/eina_str_01.c index fbe2cf0..ce30ebd 100644 --- a/src/examples/eina/eina_str_01.c +++ b/src/examples/eina/eina_str_01.c @@ -17,6 +17,7 @@ int main(int argc EINA_UNUSED, char **argv EINA_UNUSED) char *time_arr; time_t curr_time; struct tm *info; + char *b64; eina_init(); @@ -68,6 +69,10 @@ int main(int argc EINA_UNUSED, char **argv EINA_UNUSED) printf("Today's Date: %s\n", time_arr); free(time_arr); + b64 = eina_str_base64_encode((unsigned char *)"Enlightenment", 9); + printf("%s\n", b64); + free(b64); + eina_shutdown(); return 0; --
[EGIT] [core/efl] master 04/10: eet: remove useless assignment in eet cipher and silence warning.
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=f0c826c415ab419ecfbf7d7a563f48eae25b58e1 commit f0c826c415ab419ecfbf7d7a563f48eae25b58e1 Author: Vivek EllurDate: Fri Nov 20 03:01:54 2015 +0100 eet: remove useless assignment in eet cipher and silence warning. Summary: Signed-off-by: Vivek Ellur Reviewers: cedric Reviewed By: cedric Subscribers: cedric Differential Revision: https://phab.enlightenment.org/D3310 Signed-off-by: Cedric BAIL --- src/lib/eet/eet_cipher.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/eet/eet_cipher.c b/src/lib/eet/eet_cipher.c index 0f367ec..aa57e5c 100644 --- a/src/lib/eet/eet_cipher.c +++ b/src/lib/eet/eet_cipher.c @@ -260,8 +260,8 @@ eet_identity_close(Eet_Key *key) EVP_PKEY_free(key->private_key); # endif /* ifdef HAVE_GNUTLS */ free(key); -#else - key = NULL; +# else + (void)key; #endif /* ifdef HAVE_SIGNATURE */ } --
[EGIT] [core/efl] master 09/10: evas: remove useless part of code in evas_convex_hull_get function
cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d871ff8d11510f21c707d5431454489a9fa34f1c commit d871ff8d11510f21c707d5431454489a9fa34f1c Author: Oleksandr ShcherbinaDate: Mon Nov 23 08:19:49 2015 +0100 evas: remove useless part of code in evas_convex_hull_get function Summary: @fix CID: 1339788 Reviewers: raster, cedric Reviewed By: cedric Differential Revision: https://phab.enlightenment.org/D3350 Signed-off-by: Cedric BAIL --- src/lib/evas/include/evas_3d_utils.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib/evas/include/evas_3d_utils.h b/src/lib/evas/include/evas_3d_utils.h index 7c9b34e..c29f24f 100644 --- a/src/lib/evas/include/evas_3d_utils.h +++ b/src/lib/evas/include/evas_3d_utils.h @@ -2058,8 +2058,6 @@ evas_convex_hull_get(float *data, int count, int stride, Eina_Inarray *vertex, if ((!equivalent_triangle) && (!second_exist_twice) && (!triangle_chain) && (if_two < 2)) { - if (new_elem2) -free (new_elem2); new_elem2 = malloc(sizeof(Evas_Triangle3)); evas_triangle3_set(new_elem2, best, , ); eina_array_push(_elems, new_elem2); --