forked from enlightenment/efl
parent
c6267c9fb9
commit
ef2d2ddfda
|
@ -184,6 +184,12 @@ evas_object_smart_member_add(Evas_Object *obj, Evas_Object *smart_obj)
|
||||||
abort();
|
abort();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (!smart_obj->layer)
|
||||||
|
{
|
||||||
|
ERROR("No evas surface associated with smart object (%p)", smart_obj);
|
||||||
|
abort();
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (obj->layer && smart_obj->layer
|
if (obj->layer && smart_obj->layer
|
||||||
&& obj->layer->evas != smart_obj->layer->evas)
|
&& obj->layer->evas != smart_obj->layer->evas)
|
||||||
{
|
{
|
||||||
|
|
|
@ -75,7 +75,7 @@ _output_setup(int w,
|
||||||
|
|
||||||
{
|
{
|
||||||
Outbuf_Depth dep;
|
Outbuf_Depth dep;
|
||||||
DATA32 color_key;
|
DATA32 color_key = 0;
|
||||||
|
|
||||||
dep = OUTBUF_DEPTH_BGR_24BPP_888_888;
|
dep = OUTBUF_DEPTH_BGR_24BPP_888_888;
|
||||||
if (depth_type == EVAS_ENGINE_BUFFER_DEPTH_ARGB32)
|
if (depth_type == EVAS_ENGINE_BUFFER_DEPTH_ARGB32)
|
||||||
|
|
|
@ -459,7 +459,7 @@ static void
|
||||||
eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x, int y, int w, int h)
|
eng_output_redraws_next_update_push(void *data, void *surface __UNUSED__, int x, int y, int w, int h)
|
||||||
{
|
{
|
||||||
Render_Engine *re;
|
Render_Engine *re;
|
||||||
XRectangle r;
|
XRectangle r = { 0, 0, 0, 0 };
|
||||||
|
|
||||||
re = (Render_Engine *)data;
|
re = (Render_Engine *)data;
|
||||||
|
|
||||||
|
|
|
@ -345,8 +345,8 @@ eng_info_free(Evas *e __UNUSED__, void *info)
|
||||||
static int
|
static int
|
||||||
eng_setup(Evas *e, void *in)
|
eng_setup(Evas *e, void *in)
|
||||||
{
|
{
|
||||||
Render_Engine *re;
|
|
||||||
Evas_Engine_Info_Software_X11 *info;
|
Evas_Engine_Info_Software_X11 *info;
|
||||||
|
Render_Engine *re = NULL;
|
||||||
|
|
||||||
info = (Evas_Engine_Info_Software_X11 *)in;
|
info = (Evas_Engine_Info_Software_X11 *)in;
|
||||||
if (!e->engine.data.output)
|
if (!e->engine.data.output)
|
||||||
|
|
|
@ -205,6 +205,10 @@ _xr_xlib_image_new(Ximage_Info *xinf, int w, int h, int depth)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
xim_ok:
|
xim_ok:
|
||||||
_xr_xlib_image_info_pool_flush(xinf, 32, (1600 * 1200 * 32 * 2));
|
_xr_xlib_image_info_pool_flush(xinf, 32, (1600 * 1200 * 32 * 2));
|
||||||
|
|
Loading…
Reference in New Issue