dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean warnings. 

SVN revision: 17989
This commit is contained in:
sebastid 2005-10-26 20:19:42 +00:00 committed by sebastid
parent c2a325ba4c
commit 6aafd9e493
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
legacy/evas/src/lib/engines/directfb/evas_engine_dfb.c
View File

@ -113,7 +113,6 @@ void
evas_engine_directfb_setup(Evas * e, void *in)
{
Evas_Engine_Info_DirectFB *info;
IDirectFBImageProvider *provider;
info = (Evas_Engine_Info_DirectFB *) in;
/* if we arent set to directfb, why the hell do we get called?! */
@ -131,7 +130,7 @@ evas_engine_directfb_setup(Evas * e, void *in)
e->engine.data.context = e->engine.func->context_new(e->engine.data.output);
}
void *
void *
evas_engine_directfb_output_setup(int w, int h, IDirectFB * dfb,
IDirectFBSurface * surf,
DFBSurfaceDrawingFlags flags)
@ -183,12 +182,12 @@ evas_engine_directfb_output_setup(int w, int h, IDirectFB * dfb,
* to that surface is wrapped in Lock / Unlock calls whenever the data is
* manipulated directly. */
im = evas_common_image_new();
if (!im) return;
if (!im) return NULL;
im->image = evas_common_image_surface_new(im);
if (!im->image)
{
evas_common_image_free(im);
return;
return NULL;
}
im->image->w = w;
im->image->h = h;
@ -291,12 +290,9 @@ evas_engine_directfb_output_redraws_next_update_get(void *data, int *x, int *y,
int *cy, int *cw, int *ch)
{
Render_Engine *re;
RGBA_Image *surface;
Tilebuf_Rect *rect;
Evas_Object_List *l;
int ux, uy, uw, uh;
static first = 1;
DFBRegion region;
DFBRegion region;
re = (Render_Engine *) data;
if (re->end)
@ -447,6 +443,7 @@ evas_engine_directfb_context_color_get(void *data, void *context, int *r,
*g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->col.col));
*b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->col.col));
*a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->col.col));
return 1;
}
void
@ -565,8 +562,6 @@ evas_engine_directfb_draw_rectangle(void *data, void *context, void *surface,
void
rectangle_draw_internal(void *data, void *context, int x, int y, int w, int h)
{
int yy;
DATA32 *ptr;
RGBA_Draw_Context *dc = (RGBA_Draw_Context *) context;
Render_Engine *re = (Render_Engine *) data;
int r, g, b, a;
@ -926,7 +921,7 @@ evas_engine_directfb_font_draw(void *data, void *context, void *surface,
if (im)
{
int max_ascent;
int i, j;
int j;
im->flags |= RGBA_IMAGE_HAS_ALPHA;
j = ow * oh;

13
legacy/evas/src/lib/engines/directfb/evas_engine_dfb_image_objects.c
View File

@ -36,7 +36,6 @@ evas_engine_directfb_image_load(void *data, char *file, char *key, int *error)
IDirectFBImageProvider *provider;
IDirectFBSurface *image;
RGBA_Image *im = NULL;
DFBResult err;
DATA64 mod_time;
re = (Render_Engine *) data;
@ -203,8 +202,8 @@ evas_engine_directfb_image_data_get(void *data, void *image, int to_write,
IDirectFBSurface *surf;
void *p;
int pitch;
int *buf = NULL;
int size, i, tmp;
DATA32 *buf = NULL;
int size;
re = (Render_Engine *) data;
im = image;
@ -212,7 +211,7 @@ evas_engine_directfb_image_data_get(void *data, void *image, int to_write,
size = im->image->w * im->image->h * sizeof(DATA32);
surf->Lock(surf, DSLF_READ, &p, &pitch);
if (buf = malloc(size))
if ((buf = malloc(size)))
buf = memcpy(buf, p, size);
*image_data = buf;
@ -253,6 +252,7 @@ evas_engine_directfb_image_alpha_set(void *data, void *image, int has_alpha)
im->flags |= RGBA_IMAGE_HAS_ALPHA;
else
im->flags &= ~RGBA_IMAGE_HAS_ALPHA;
return im;
}
int
@ -285,7 +285,6 @@ evas_engine_directfb_image_draw(void *data, void *context, void *surface,
RGBA_Image *im = (RGBA_Image *) image;
RGBA_Draw_Context *dc = (RGBA_Draw_Context *) context;
IDirectFBSurface *img = (IDirectFBSurface *) im->image->data;
DFBSurfaceDescription dsc;
src_w = im->image->w;
src_h = im->image->h;
@ -585,8 +584,6 @@ _dfb_image_create(Render_Engine *re, int w, int h)
static void
_dfb_image_free(RGBA_Image *im)
{
int i;
if (im->image) _dfb_image_surface_free(im->image);
if (im->info.file) free(im->info.file);
if (im->info.key) free(im->info.key);
@ -690,8 +687,6 @@ _dfb_image_flush_cache(void)
static void
_dfb_image_dirty(RGBA_Image *im)
{
int i;
_dfb_image_unstore(im);
im->flags |= RGBA_IMAGE_IS_DIRTY;
}