diff options
Diffstat (limited to 'libraries/evas/src/lib/canvas/evas_object_main.c')
-rw-r--r-- | libraries/evas/src/lib/canvas/evas_object_main.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/libraries/evas/src/lib/canvas/evas_object_main.c b/libraries/evas/src/lib/canvas/evas_object_main.c index 86ab498..81fc858 100644 --- a/libraries/evas/src/lib/canvas/evas_object_main.c +++ b/libraries/evas/src/lib/canvas/evas_object_main.c | |||
@@ -230,7 +230,7 @@ evas_object_clip_changes_clean(Evas_Object *obj) | |||
230 | } | 230 | } |
231 | 231 | ||
232 | void | 232 | void |
233 | evas_object_render_pre_effect_updates(Eina_Array *rects, Evas_Object *obj, int is_v, int was_v) | 233 | evas_object_render_pre_effect_updates(Eina_Array *rects, Evas_Object *obj, int is_v, int was_v __UNUSED__) |
234 | { | 234 | { |
235 | Eina_Rectangle *r; | 235 | Eina_Rectangle *r; |
236 | Evas_Object *clipper; | 236 | Evas_Object *clipper; |
@@ -241,7 +241,6 @@ evas_object_render_pre_effect_updates(Eina_Array *rects, Evas_Object *obj, int i | |||
241 | 241 | ||
242 | if (obj->smart.smart) goto end; | 242 | if (obj->smart.smart) goto end; |
243 | /* FIXME: was_v isn't used... why? */ | 243 | /* FIXME: was_v isn't used... why? */ |
244 | was_v = 0; | ||
245 | if (!obj->clip.clipees) | 244 | if (!obj->clip.clipees) |
246 | { | 245 | { |
247 | EINA_ARRAY_ITER_NEXT(rects, i, r, it) | 246 | EINA_ARRAY_ITER_NEXT(rects, i, r, it) |
@@ -1042,6 +1041,22 @@ evas_object_color_set(Evas_Object *obj, int r, int g, int b, int a) | |||
1042 | if (g > 255) g = 255; if (g < 0) g = 0; | 1041 | if (g > 255) g = 255; if (g < 0) g = 0; |
1043 | if (b > 255) b = 255; if (b < 0) b = 0; | 1042 | if (b > 255) b = 255; if (b < 0) b = 0; |
1044 | if (a > 255) a = 255; if (a < 0) a = 0; | 1043 | if (a > 255) a = 255; if (a < 0) a = 0; |
1044 | if (r > a) | ||
1045 | { | ||
1046 | r = a; | ||
1047 | ERR("Evas only handle pre multiplied color !"); | ||
1048 | } | ||
1049 | if (g > a) | ||
1050 | { | ||
1051 | g = a; | ||
1052 | ERR("Evas only handle pre multiplied color !"); | ||
1053 | } | ||
1054 | if (b > a) | ||
1055 | { | ||
1056 | b = a; | ||
1057 | ERR("Evas only handle pre multiplied color !"); | ||
1058 | } | ||
1059 | |||
1045 | if (evas_object_intercept_call_color_set(obj, r, g, b, a)) return; | 1060 | if (evas_object_intercept_call_color_set(obj, r, g, b, a)) return; |
1046 | if (obj->smart.smart) | 1061 | if (obj->smart.smart) |
1047 | { | 1062 | { |