Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/directfb
Modified Files:
evas_engine_dfb.c evas_engine_dfb.h
evas_engine_dfb_image_objects.c
Log Message:
whitespace
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/directfb/evas_engine_dfb.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- evas_engine_dfb.c 28 Mar 2005 05:52:01 -0000 1.13
+++ evas_engine_dfb.c 22 May 2005 02:49:49 -0000 1.14
@@ -84,7 +84,7 @@
};
-
+
void *
evas_engine_directfb_info(Evas * e)
{
@@ -104,7 +104,7 @@
evas_engine_directfb_info_free(Evas *e, void *info)
{
Evas_Engine_Info_DirectFB *in;
-
+
in = (Evas_Engine_Info_DirectFB *)info;
free(in);
}
@@ -179,13 +179,13 @@
re->backbuf->SetDrawingFlags(re->backbuf, flags);
- /* We create a "fake" RGBA_Image which points the to DFB surface. Each
access
+ /* We create a "fake" RGBA_Image which points the to DFB surface. Each
access
* to that surface is wrapped in Lock / Unlock calls whenever the data is
* manipulated directly. */
im = evas_common_image_new();
if (!im) return;
im->image = evas_common_image_surface_new(im);
- if (!im->image)
+ if (!im->image)
{
evas_common_image_free(im);
return;
@@ -334,7 +334,7 @@
re->backbuf->SetClip(re->backbuf, ®ion);
re->backbuf->Clear(re->backbuf, 0, 0, 0, 0);
re->backbuf->SetClip(re->backbuf, NULL);
-
+
/* Return the "fake" surface so it is passed to the drawing routines. */
return re->rgba_image;
@@ -502,7 +502,7 @@
evas_common_draw_context_clear_cutouts(context);
}
-/*
+/*
* Rectangles
*
*
@@ -618,7 +618,7 @@
evas_common_cpu_end_opt();
}
-/*
+/*
* Lines
*
*
@@ -638,7 +638,7 @@
re->backbuf->DrawLine(re->backbuf, x1, y1, x2, y2);
}
-/*
+/*
* Polygons
*
*
@@ -649,7 +649,7 @@
evas_engine_directfb_polygon_point_add(void *data, void *context, void
*polygon, int x, int y)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
return evas_common_polygon_point_add(polygon, x, y);
context = NULL;
@@ -659,7 +659,7 @@
evas_engine_directfb_polygon_points_clear(void *data, void *context, void
*polygon)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
return evas_common_polygon_points_clear(polygon);
context = NULL;
@@ -674,7 +674,7 @@
RGBA_Image *im;
void *p;
int pitch;
-
+
re = (Render_Engine *)data;
im = surface;
surf = (IDirectFBSurface *)im->image->data;
@@ -687,7 +687,7 @@
}
-/*
+/*
* Gradients
*
*
@@ -697,7 +697,7 @@
evas_engine_directfb_gradient_color_add(void *data, void *context, void
*gradient, int r, int g, int b, int a, int distance)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
if (!gradient)
gradient = evas_common_gradient_new();
@@ -710,7 +710,7 @@
evas_engine_directfb_gradient_colors_clear(void *data, void *context, void
*gradient)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
if (gradient) evas_common_gradient_free(gradient);
return NULL;
@@ -725,7 +725,7 @@
RGBA_Image *im;
void *p;
int pitch;
-
+
re = (Render_Engine *)data;
im = surface;
surf = (IDirectFBSurface *)im->image->data;
@@ -739,7 +739,7 @@
-/*
+/*
* Font objects
*
*
@@ -768,7 +768,7 @@
evas_engine_directfb_font_add(void *data, void *font, char *name, int size)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
return evas_common_font_add(font, name, size);
}
@@ -777,7 +777,7 @@
evas_engine_directfb_font_memory_add(void *data, void *font, char *name, int
size, const void *fdata, int fdata_size)
{
Render_Engine *re;
-
+
re = (Render_Engine *)data;
return evas_common_font_memory_add(font, name, size, fdata, fdata_size);
}
@@ -904,7 +904,7 @@
im = surface;
re = (Render_Engine *)data;
- surf = (IDirectFBSurface *)im->image->data;
+ surf = (IDirectFBSurface *)im->image->data;
surf->Lock(surf, DSLF_WRITE, &p, &pitch);
im->image->data = p;
im->flags |= RGBA_IMAGE_HAS_ALPHA;
@@ -920,32 +920,32 @@
if (dc)
{
RGBA_Image *im;
-
+
dc->col.col = dc_in->col.col;
im = evas_common_image_create(ow, oh);
if (im)
{
int max_ascent;
int i, j;
-
+
im->flags |= RGBA_IMAGE_HAS_ALPHA;
j = ow * oh;
memset(im->image->data, 0, j * sizeof(DATA32));
-
+
max_ascent = evas_common_font_max_ascent_get(font);
-
+
evas_common_font_draw(im, dc, font, 0, max_ascent, text);
evas_common_cpu_end_opt();
- evas_common_scale_rgba_in_to_out_clip_smooth(im, surface,
context,
- 0, 0, ow, oh,
- x, y - ((max_ascent * h) /
oh),
+ evas_common_scale_rgba_in_to_out_clip_smooth(im, surface,
context,
+ 0, 0, ow, oh,
+ x, y - ((max_ascent * h) /
oh),
w, h);
evas_common_image_free(im);
}
evas_common_draw_context_free(dc);
}
}
-
+
surf->Unlock(surf);
im->image->data = (void *)surf;
evas_common_cpu_end_opt();
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/directfb/evas_engine_dfb.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- evas_engine_dfb.h 20 Mar 2005 15:57:55 -0000 1.3
+++ evas_engine_dfb.h 22 May 2005 02:49:49 -0000 1.4
@@ -133,10 +133,10 @@
double angle);
void *evas_engine_directfb_font_load(void *data, char *name,
int size);
-void *evas_engine_directfb_font_memory_load(void *data,
+void *evas_engine_directfb_font_memory_load(void *data,
char *name,
- int size,
- const void *fdata,
+ int size,
+ const void *fdata,
int fdata_size);
void *evas_engine_directfb_font_add(void *data, void *font, char *name, int
size);
void *evas_engine_directfb_font_memory_add(void *data, void *font, char *name,
int size, const void *fdata, int fdata_size);
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/directfb/evas_engine_dfb_image_objects.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- evas_engine_dfb_image_objects.c 26 Jan 2005 07:49:56 -0000 1.9
+++ evas_engine_dfb_image_objects.c 22 May 2005 02:49:49 -0000 1.10
@@ -24,7 +24,7 @@
static RGBA_Image *_dfb_image_find(const char *filename, const char *key,
DATA64 timestamp);
/*
- * Image objects
+ * Image objects
*/
void *
@@ -107,7 +107,7 @@
evas_engine_directfb_image_new_from_copied_data(void *data, int w, int h,
DATA32 * image_data)
{
-
+
Render_Engine *re;
RGBA_Image *im = NULL;
IDirectFBSurface *surf;
@@ -116,7 +116,7 @@
re = (Render_Engine *) data;
im = _dfb_image_create(re, w, h);
-
+
if (im)
{
surf = (IDirectFBSurface *) im->image->data;
@@ -125,7 +125,7 @@
memcpy(p, image_data, w * h * sizeof(DATA32));
surf->Unlock(surf);
}
- }
+ }
/* FIXME */
free(image_data);
return im;
@@ -215,7 +215,7 @@
if (buf = malloc(size))
buf = memcpy(buf, p, size);
*image_data = buf;
-
+
surf->Unlock(surf);
return im;
}
@@ -232,7 +232,7 @@
if (image_data != im->image->data)
{
int w, h;
-
+
w = im->image->w;
h = im->image->h;
_dfb_image_unref(im);
@@ -465,7 +465,7 @@
{
re->backbuf->SetColor(re->backbuf, r, g, b, a);
}
-
+
re->backbuf->SetSrcBlendFunction(re->backbuf, DSBF_SRCALPHA);
img->SetSrcBlendFunction(img, DSBF_INVSRCALPHA);
@@ -537,7 +537,7 @@
_dfb_image_surface_free(RGBA_Surface *is)
{
IDirectFBSurface *surf;
- if ( (is->data) && (!is->no_free) )
+ if ( (is->data) && (!is->no_free) )
{
surf = (IDirectFBSurface *)is->data;
surf->Release(surf);
@@ -553,11 +553,11 @@
RGBA_Image *im;
DFBSurfaceDescription dsc;
IDirectFBSurface *surf;
-
+
im = evas_common_image_new();
if (!im) return NULL;
im->image = evas_common_image_surface_new(im);
- if (!im->image)
+ if (!im->image)
{
_dfb_image_free(im);
return NULL;
@@ -586,7 +586,7 @@
_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);
@@ -612,7 +612,7 @@
if (im->references <= 0) /* we were are now in cache - put us in */
{
_dfb_image_unstore(im);
- if ((cache_size > 0) &&
+ if ((cache_size > 0) &&
(!(im->flags & RGBA_IMAGE_IS_DIRTY)))
{
_dfb_image_cache(im);
@@ -670,28 +670,28 @@
_dfb_image_flush_cache(void)
{
Evas_Object_List *l, *l_next;
-
+
if (!cache) return;
if (cache_usage < cache_size) return;
-
+
for (l = cache->last; l;)
{
RGBA_Image *im;
-
+
l_next = l->prev;
im = (RGBA_Image *)l;
_dfb_image_uncache(im);
_dfb_image_free(im);
if (cache_usage <= cache_size) return;
l = l_next;
- }
+ }
}
static void
_dfb_image_dirty(RGBA_Image *im)
{
int i;
-
+
_dfb_image_unstore(im);
im->flags |= RGBA_IMAGE_IS_DIRTY;
}
@@ -723,7 +723,7 @@
strcat(key, buf);
images = evas_hash_add(images, key, im);
free(key);
- im->flags |= RGBA_IMAGE_INDEXED;
+ im->flags |= RGBA_IMAGE_INDEXED;
}
static void
@@ -763,7 +763,7 @@
char *str;
int l1, l2, l3;
char buf[256];
-
+
if ((!filename) && (!key)) return NULL;
l1 = 0;
if (filename) l1 = strlen(filename);
@@ -778,29 +778,29 @@
strcat(str, "/:/");
if (key) strcat(str, key);
strcat(str, "/:/");
- strcat(str, buf);
+ strcat(str, buf);
im = evas_hash_find(images, str);
free(str);
if (im) return im;
-
+
for (l = cache; l; l = l->next)
{
int ok;
-
+
im = (RGBA_Image *)l;
ok = 0;
- if ((filename) && (im->info.file) &&
+ if ((filename) && (im->info.file) &&
(!strcmp(filename, im->info.file)))
ok++;
if ((!filename) && (!im->info.file))
ok++;
- if ((key) && (im->info.key) &&
+ if ((key) && (im->info.key) &&
(!strcmp(key, im->info.key)))
ok++;
if ((!key) && (!im->info.key))
ok++;
if (im->timestamp == timestamp)
- ok++;
+ ok++;
if (ok >= 3) return im;
}
return NULL;
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
