From c22fa8a96ac7c28f93856a8577825b78be9b5270 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Wed, 14 Oct 2015 11:19:48 +0900 Subject: [PATCH] Evas: Some coverity fixes This are false alarms. But the explicit null check doesn't hurt. Also, Coverity doesn't like eo_do_ret. Neither do I. :) - CID 1327246 - CID 1327245 --- src/lib/evas/canvas/evas_object_image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index 0a525ba346..fdf31c7317 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -3318,7 +3318,7 @@ _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data *obj, uvw = imagew; uvh = imageh; } - else if (!o->cur->source) + else if (!o->cur->source || !source) { pixels = evas_process_dirty_pixels(eo_obj, obj, o, output, surface, o->engine_data); /* pixels = o->engine_data; */ @@ -3340,8 +3340,8 @@ _evas_image_render(Eo *eo_obj, Evas_Object_Protected_Data *obj, pixels = oi->engine_data; if (oi->has_filter) { - void *output_buffer = eo_do_ret(source->object, output_buffer, - evas_filter_output_buffer_get()); + void *output_buffer = NULL; + eo_do(source->object, output_buffer = evas_filter_output_buffer_get()); if (output_buffer) pixels = output_buffer; }