diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c index bfab21f2eb..0f1c27c4ad 100644 --- a/src/lib/evas/canvas/evas_font_dir.c +++ b/src/lib/evas/canvas/evas_font_dir.c @@ -1469,7 +1469,7 @@ _evas_canvas_font_hinting_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) EOLIAN Eina_Bool _evas_canvas_font_hinting_can_hint(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, Evas_Font_Hinting_Flags hinting) { - if (e->engine.func->font_hinting_can_hint) + if (e->engine.func->font_hinting_can_hint && e->engine.data.output) return e->engine.func->font_hinting_can_hint(e->engine.data.output, hinting); else return EINA_FALSE; @@ -1480,7 +1480,8 @@ _evas_canvas_font_cache_flush(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { evas_canvas_async_block(e); evas_render_rendering_wait(e); - e->engine.func->font_cache_flush(e->engine.data.output); + if (e->engine.data.output) + e->engine.func->font_cache_flush(e->engine.data.output); } EOLIAN void @@ -1489,14 +1490,16 @@ _evas_canvas_font_cache_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int size) if (size < 0) size = 0; evas_canvas_async_block(e); evas_render_rendering_wait(e); - e->engine.func->font_cache_set(e->engine.data.output, size); + if (e->engine.data.output) + e->engine.func->font_cache_set(e->engine.data.output, size); } EOLIAN int _evas_canvas_font_cache_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { - return e->engine.func->font_cache_get(e->engine.data.output); - + if (e->engine.data.output) + return e->engine.func->font_cache_get(e->engine.data.output); + return -1; } EOLIAN Eina_List* diff --git a/src/lib/evas/canvas/evas_object_image.c b/src/lib/evas/canvas/evas_object_image.c index 88fa6b11ae..5b309ddc4f 100644 --- a/src/lib/evas/canvas/evas_object_image.c +++ b/src/lib/evas/canvas/evas_object_image.c @@ -1119,7 +1119,8 @@ _evas_canvas_image_cache_flush(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { evas_canvas_async_block(e); evas_render_rendering_wait(e); - e->engine.func->image_cache_flush(e->engine.data.output); + if (e->engine.data.output) + e->engine.func->image_cache_flush(e->engine.data.output); } EOLIAN void @@ -1167,13 +1168,16 @@ _evas_canvas_image_cache_set(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e, int size if (size < 0) size = 0; evas_canvas_async_block(e); evas_render_rendering_wait(e); - e->engine.func->image_cache_set(e->engine.data.output, size); + if (e->engine.data.output) + e->engine.func->image_cache_set(e->engine.data.output, size); } EOLIAN int _evas_canvas_image_cache_get(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e) { - return e->engine.func->image_cache_get(e->engine.data.output); + if (e->engine.data.output) + return e->engine.func->image_cache_get(e->engine.data.output); + return -1; } EOLIAN Eina_Bool