e_comp: change type of color_id from int into uint.

Change-Id: Ia13769f776dd4dcece045246259117e680c6efe8

diff --git a/src/bin/compmgr/e_comp.c b/src/bin/compmgr/e_comp.c
index c74161cd0711c175dcf26e486aa62d0256db1a94..f8cd2554272baa08cb1ffeb1b235d7ad2824ade0 100644 (file)
--- a/src/bin/compmgr/e_comp.c
+++ b/src/bin/compmgr/e_comp.c
@@ -1378,7 +1378,7 @@ e_comp_image_filter_set(E_Comp_Image_Filter filter)
 }
 
 E_API void
-e_comp_image_filter_edge_detection_param_set(double thickness, int color_id)
+e_comp_image_filter_edge_detection_param_set(double thickness, unsigned int color_id)
 {
    e_comp->edge_detection_thickness = thickness;
    e_comp->edge_detection_color_id = color_id;

diff --git a/src/bin/compmgr/e_comp_object.c b/src/bin/compmgr/e_comp_object.c
index 6991f88e721b34bf144451e608c6714efd8372c3..3fcfd6ce0e05e7e7d669d581c54ae1ab7c3da2ef 100644 (file)
--- a/src/bin/compmgr/e_comp_object.c
+++ b/src/bin/compmgr/e_comp_object.c
@@ -4656,15 +4656,13 @@ e_comp_object_native_usable_get(Evas_Object *obj)
 EINTERN Eina_Bool
 e_comp_object_image_filter_set(Evas_Object *obj, E_Comp_Image_Filter filter)
 {
-   char efl_gfx_lua_code[64] = "";
+   char efl_gfx_code[64] = "";
 
    API_ENTRY EINA_FALSE;
    EINA_SAFETY_ON_NULL_RETURN_VAL(cw->ec, EINA_FALSE);
    if (e_object_is_del(E_OBJECT(cw->ec))) return EINA_FALSE;
    if (!e_client_cdata_get(cw->ec)) return EINA_FALSE;
 
-   if (cw->image_filter == filter) return EINA_TRUE;
-
    switch (filter)
      {
       case E_COMP_IMAGE_FILTER_BLUR:
@@ -4677,9 +4675,9 @@ e_comp_object_image_filter_set(Evas_Object *obj, E_Comp_Image_Filter filter)
          efl_gfx_filter_program_set(cw->obj, "inverse_color ()", "image_filter");
          break;
       case E_COMP_IMAGE_FILTER_EDGE_DETECTION:
-         sprintf(efl_gfx_lua_code, "edge_detection { thickness = %lf, color_id = %d }",
+         snprintf(efl_gfx_code, sizeof(efl_gfx_code), "edge_detection { thickness = %lf, color_id = %u }",
             e_comp->edge_detection_thickness, e_comp->edge_detection_color_id);
-         efl_gfx_filter_program_set(cw->obj, efl_gfx_lua_code, "image_filter");
+         efl_gfx_filter_program_set(cw->obj, efl_gfx_code, "image_filter");
          break;
       case E_COMP_IMAGE_FILTER_NONE:
       default:

diff --git a/src/include/e_comp.h b/src/include/e_comp.h
index 1ba3e9c440d091317e65696e8861515585c70eca..69b797f628f80ab556829e0b4684ceb87c3909d2 100644 (file)
--- a/src/include/e_comp.h
+++ b/src/include/e_comp.h
@@ -136,7 +136,7 @@ struct _E_Comp
    E_Comp_Image_Filter image_filter;
 
    double edge_detection_thickness;
-   int edge_detection_color_id;
+   unsigned int edge_detection_color_id;
 
    struct
    {
@@ -198,6 +198,7 @@ E_API int             e_comp_norender_get(void);
 E_API int             e_comp_nocomp_override_get(void);
 
 E_API Eina_Bool           e_comp_image_filter_set(E_Comp_Image_Filter filter);
+E_API void                e_comp_image_filter_edge_detection_param_set(double thickness, unsigned int color_id);
 E_API E_Comp_Image_Filter e_comp_image_filter_get(void);
 
 E_API void            e_comp_ec_list_lock(void);