Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/directfb
Modified Files:
evas_engine_dfb.c evas_engine_dfb_image_objects.c
Log Message:
Clean warnings.
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/directfb/evas_engine_dfb.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- evas_engine_dfb.c 22 May 2005 02:49:49 -0000 1.14
+++ evas_engine_dfb.c 26 Oct 2005 20:19:42 -0000 1.15
@@ -113,7 +113,6 @@
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 @@
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 @@
* 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 @@
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 @@
*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 @@
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 @@
if (im)
{
int max_ascent;
- int i, j;
+ int j;
im->flags |= RGBA_IMAGE_HAS_ALPHA;
j = ow * oh;
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/directfb/evas_engine_dfb_image_objects.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- evas_engine_dfb_image_objects.c 22 May 2005 02:49:49 -0000 1.10
+++ evas_engine_dfb_image_objects.c 26 Oct 2005 20:19:42 -0000 1.11
@@ -36,7 +36,6 @@
IDirectFBImageProvider *provider;
IDirectFBSurface *image;
RGBA_Image *im = NULL;
- DFBResult err;
DATA64 mod_time;
re = (Render_Engine *) data;
@@ -203,8 +202,8 @@
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 @@
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 @@
im->flags |= RGBA_IMAGE_HAS_ALPHA;
else
im->flags &= ~RGBA_IMAGE_HAS_ALPHA;
+ return im;
}
int
@@ -285,7 +285,6 @@
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 @@
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 @@
static void
_dfb_image_dirty(RGBA_Image *im)
{
- int i;
-
_dfb_image_unstore(im);
im->flags |= RGBA_IMAGE_IS_DIRTY;
}
-------------------------------------------------------
This SF.Net email is sponsored by the JBoss Inc.
Get Certified Today * Register for a JBoss Training Course
Free Certification Exam for All Training Attendees Through End of 2005
Visit http://www.jboss.com/services/certification for more information
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
