Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
Makefile.am evas_gradient_angular.c evas_gradient_linear.c
evas_gradient_main.c evas_gradient_radial.c
evas_gradient_rectangular.c evas_gradient_sinusoidal.c
Added Files:
evas_font.h evas_gradient.h evas_gradient_private.h
Log Message:
* move font and gradient declarations to their own files
* add vim headers
* remove some trailing spaces
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- Makefile.am 11 Jul 2008 08:21:25 -0000 1.32
+++ Makefile.am 19 Jul 2008 17:13:41 -0000 1.33
@@ -73,6 +73,9 @@
evas_convert_rgb_32.h \
evas_convert_rgb_8.h \
evas_convert_yuv.h \
+evas_font.h \
+evas_gradient.h \
+evas_gradient_private.h \
evas_scale_main.h \
evas_scale_smooth.h \
evas_scale_smooth_scaler.c \
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_gradient_angular.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_gradient_angular.c 30 Sep 2006 10:18:32 -0000 1.8
+++ evas_gradient_angular.c 19 Jul 2008 17:13:42 -0000 1.9
@@ -1,6 +1,12 @@
-#include "evas_common.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include <math.h>
+#include "evas_common.h"
+#include "evas_gradient_private.h"
+
typedef struct _Angular_Data Angular_Data;
struct _Angular_Data
{
@@ -11,31 +17,31 @@
int len;
};
-static void
+static void
angular_init(void);
-static void
+static void
angular_shutdown(void);
-static void
+static void
angular_init_geom(RGBA_Gradient *gr);
-static void
+static void
angular_setup_geom(RGBA_Gradient *gr);
-static void
+static void
angular_free_geom(void *gdata);
-static int
+static int
angular_has_alpha(RGBA_Gradient *gr, int op);
-static int
+static int
angular_has_mask(RGBA_Gradient *gr, int op);
-static int
+static int
angular_get_map_len(RGBA_Gradient *gr);
-static Gfx_Func_Gradient_Fill
+static Gfx_Func_Gradient_Fill
angular_get_fill_func(RGBA_Gradient *gr, int op, unsigned char aa);
static RGBA_Gradient_Type angular = {"angular", angular_init,
angular_shutdown,
@@ -190,24 +196,24 @@
return &angular;
}
-static void
+static void
angular_init(void)
{
}
-static void
+static void
angular_shutdown(void)
{
}
-static void
+static void
angular_free_geom(void *gdata)
{
Angular_Data *data = (Angular_Data *)gdata;
if (data) free(data);
}
-static void
+static void
angular_setup_geom(RGBA_Gradient *gr)
{
Angular_Data *angular_data;
@@ -298,7 +304,7 @@
if (gr->has_alpha | gr->map.has_alpha)
return 1;
- if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
+ if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
(op == _EVAS_RENDER_MASK) || (op == _EVAS_RENDER_MUL) )
return 0;
angular_data = (Angular_Data *)gr->type.gdata;
@@ -308,7 +314,7 @@
if ( ((gr->fill.spread == _EVAS_TEXTURE_RESTRICT) ||
(gr->fill.spread == _EVAS_TEXTURE_RESTRICT_REFLECT) ||
(gr->fill.spread == _EVAS_TEXTURE_RESTRICT_REPEAT))
- && (angular_data->cy < 1.0) )
+ && (angular_data->cy < 1.0) )
return 1;
return 0;
}
@@ -319,7 +325,7 @@
Angular_Data *angular_data;
if (!gr || (gr->type.geometer != &angular)) return 0;
- if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
+ if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
(op == _EVAS_RENDER_MASK) || (op == _EVAS_RENDER_MUL) )
{
angular_data = (Angular_Data *)gr->type.gdata;
@@ -358,7 +364,7 @@
if (!angular_data) return sfunc;
angular_data->off = gr->map.offset;
- if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
+ if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
(op == _EVAS_RENDER_MASK) || (op == _EVAS_RENDER_MUL) )
masked_op = 1;
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_gradient_linear.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- evas_gradient_linear.c 31 May 2008 04:16:39 -0000 1.8
+++ evas_gradient_linear.c 19 Jul 2008 17:13:42 -0000 1.9
@@ -1,6 +1,12 @@
-#include "evas_common.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include <math.h>
+#include "evas_common.h"
+#include "evas_gradient_private.h"
+
#define GRAD_LINEAR_DIAG 1
#define GRAD_LINEAR_CODIAG 2
@@ -17,19 +23,19 @@
unsigned char at_angle : 1;
};
-static void
+static void
linear_init(void);
-static void
+static void
linear_shutdown(void);
-static void
+static void
linear_init_geom(RGBA_Gradient *gr);
static void
linear_setup_geom(RGBA_Gradient *gr);
-static void
+static void
linear_free_geom(void *gdata);
static int
@@ -132,17 +138,17 @@
return &linear;
}
-static void
+static void
linear_init(void)
{
}
-static void
+static void
linear_shutdown(void)
{
}
-static void
+static void
linear_free_geom(void *gdata)
{
Linear_Data *data = (Linear_Data *)gdata;
@@ -220,7 +226,7 @@
linear_data->yy0 = (linear_data->ca * (yoff << 16)) - (linear_data->sa *
(xoff << 16));
linear_data->off = gr->map.offset;
-
+
if ((linear_data->ca != 1.0) || (linear_data->sa != 0.0))
linear_data->at_angle = 1;
}
@@ -231,7 +237,7 @@
if (!gr || (gr->type.geometer != &linear)) return 0;
if (gr->has_alpha | gr->map.has_alpha)
return 1;
- if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
+ if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
(op == _EVAS_RENDER_MASK) || (op == _EVAS_RENDER_MUL) )
return 0;
if ( (gr->fill.spread == _EVAS_TEXTURE_RESTRICT) ||
@@ -245,7 +251,7 @@
linear_has_mask(RGBA_Gradient *gr, int op)
{
if (!gr || (gr->type.geometer != &linear)) return 0;
- if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
+ if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
(op == _EVAS_RENDER_MASK) || (op == _EVAS_RENDER_MUL) )
{
if ( (gr->fill.spread == _EVAS_TEXTURE_RESTRICT) ||
@@ -279,7 +285,7 @@
linear_data = (Linear_Data *)gr->type.gdata;
if (!linear_data) return sfunc;
- if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
+ if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
(op == _EVAS_RENDER_MASK) || (op == _EVAS_RENDER_MUL) )
masked_op = 1;
@@ -421,7 +427,7 @@
y = src_len - y - 1;
}
c = src[y];
- while (dst < dst_end)
+ while (dst < dst_end)
*dst++ = c;
return;
}
@@ -651,7 +657,7 @@
return;
}
c = src[y];
- while (dst < dst_end)
+ while (dst < dst_end)
*dst++ = c;
return;
}
@@ -791,7 +797,7 @@
return;
}
c = src[y];
- while (dst < dst_end)
+ while (dst < dst_end)
{
*dst++ = c; *mask++ = 255;
}
@@ -937,7 +943,7 @@
y = src_len - y - 1;
}
c = src[y];
- while (dst < dst_end)
+ while (dst < dst_end)
*dst++ = c;
return;
}
@@ -1079,7 +1085,7 @@
y = src_len - y - 1;
}
c = src[y];
- while (dst < dst_end)
+ while (dst < dst_end)
{ *dst++ = c; *mask++ = 255; }
return;
}
@@ -1203,7 +1209,7 @@
if (y < 0)
y += src_len;
c = src[y];
- while (dst < dst_end)
+ while (dst < dst_end)
*dst++ = c;
return;
}
@@ -1335,7 +1341,7 @@
if (y < 0)
y += src_len;
c = src[y];
- while (dst < dst_end)
+ while (dst < dst_end)
{ *dst++ = c; *mask++ = 255; }
return;
}
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_gradient_main.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- evas_gradient_main.c 11 Jul 2008 06:36:30 -0000 1.20
+++ evas_gradient_main.c 19 Jul 2008 17:13:42 -0000 1.21
@@ -8,6 +8,7 @@
#include "evas_convert_main.h"
#include "evas_convert_color.h"
#include "evas_scale_span.h"
+#include "evas_gradient_private.h"
static void _get_word(char *in, char *key);
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/engines/common/evas_gradient_radial.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_gradient_radial.c 30 Sep 2006 10:18:32 -0000 1.5
+++ evas_gradient_radial.c 19 Jul 2008 17:13:42 -0000 1.6
@@ -1,6 +1,12 @@
-#include "evas_common.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include <math.h>
+#include "evas_common.h"
+#include "evas_gradient_private.h"
+
typedef struct _Radial_Data Radial_Data;
struct _Radial_Data
@@ -12,31 +18,31 @@
int len;
};
-static void
+static void
radial_init(void);
-static void
+static void
radial_shutdown(void);
-static void
+static void
radial_init_geom(RGBA_Gradient *gr);
-static void
+static void
radial_setup_geom(RGBA_Gradient *gr);
-static void
+static void
radial_free_geom(void *gdata);
-static int
+static int
radial_has_alpha(RGBA_Gradient *gr, int op);
-static int
+static int
radial_has_mask(RGBA_Gradient *gr, int op);
-static int
+static int
radial_get_map_len(RGBA_Gradient *gr);
-static Gfx_Func_Gradient_Fill
+static Gfx_Func_Gradient_Fill
radial_get_fill_func(RGBA_Gradient *gr, int op, unsigned char aa);
static RGBA_Gradient_Type radial = {"radial", radial_init, radial_shutdown,
@@ -133,24 +139,24 @@
return &radial;
}
-static void
+static void
radial_init(void)
{
}
-static void
+static void
radial_shutdown(void)
{
}
-static void
+static void
radial_free_geom(void *gdata)
{
Radial_Data *data = (Radial_Data *)gdata;
if (data) free(data);
}
-static void
+static void
radial_setup_geom(RGBA_Gradient *gr)
{
Radial_Data *radial_data;
@@ -228,7 +234,7 @@
if (!gr || (gr->type.geometer != &radial)) return 0;
if (gr->has_alpha | gr->map.has_alpha)
return 1;
- if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
+ if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
(op == _EVAS_RENDER_MASK) || (op == _EVAS_RENDER_MUL) )
return 0;
radial_data = (Radial_Data *)gr->type.gdata;
@@ -248,7 +254,7 @@
Radial_Data *radial_data;
if (!gr || (gr->type.geometer != &radial)) return 0;
- if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
+ if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
(op == _EVAS_RENDER_MASK) || (op == _EVAS_RENDER_MUL) )
{
radial_data = (Radial_Data *)gr->type.gdata;
@@ -286,7 +292,7 @@
if (!radial_data) return sfunc;
radial_data->off = gr->map.offset;
- if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
+ if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
(op == _EVAS_RENDER_MASK) || (op == _EVAS_RENDER_MUL) )
masked_op = 1;
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_gradient_rectangular.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evas_gradient_rectangular.c 30 Sep 2006 10:18:32 -0000 1.5
+++ evas_gradient_rectangular.c 19 Jul 2008 17:13:42 -0000 1.6
@@ -1,6 +1,12 @@
-#include "evas_common.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include <math.h>
+#include "evas_common.h"
+#include "evas_gradient_private.h"
+
typedef struct _Rectangular_Data Rectangular_Data;
struct _Rectangular_Data
@@ -12,31 +18,31 @@
int len;
};
-static void
+static void
rectangular_init(void);
-static void
+static void
rectangular_shutdown(void);
-static void
+static void
rectangular_init_geom(RGBA_Gradient *gr);
-static void
+static void
rectangular_setup_geom(RGBA_Gradient *gr);
-static void
+static void
rectangular_free_geom(void *gdata);
-static int
+static int
rectangular_has_alpha(RGBA_Gradient *gr, int op);
-static int
+static int
rectangular_has_mask(RGBA_Gradient *gr, int op);
-static int
+static int
rectangular_get_map_len(RGBA_Gradient *gr);
-static Gfx_Func_Gradient_Fill
+static Gfx_Func_Gradient_Fill
rectangular_get_fill_func(RGBA_Gradient *gr, int op, unsigned char aa);
static RGBA_Gradient_Type rectangular = {"rectangular", rectangular_init,
rectangular_shutdown,
@@ -133,24 +139,24 @@
return &rectangular;
}
-static void
+static void
rectangular_init(void)
{
}
-static void
+static void
rectangular_shutdown(void)
{
}
-static void
+static void
rectangular_free_geom(void *gdata)
{
Rectangular_Data *data = (Rectangular_Data *)gdata;
if (data) free(data);
}
-static void
+static void
rectangular_setup_geom(RGBA_Gradient *gr)
{
Rectangular_Data *rectangular_data;
@@ -228,7 +234,7 @@
if (!gr || (gr->type.geometer != &rectangular)) return 0;
if (gr->has_alpha | gr->map.has_alpha)
return 1;
- if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
+ if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
(op == _EVAS_RENDER_MASK) || (op == _EVAS_RENDER_MUL) )
return 0;
rectangular_data = (Rectangular_Data *)gr->type.gdata;
@@ -248,7 +254,7 @@
Rectangular_Data *rectangular_data;
if (!gr || (gr->type.geometer != &rectangular)) return 0;
- if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
+ if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
(op == _EVAS_RENDER_MASK) || (op == _EVAS_RENDER_MUL) )
{
rectangular_data = (Rectangular_Data *)gr->type.gdata;
@@ -287,7 +293,7 @@
if (!rectangular_data) return sfunc;
rectangular_data->off = gr->map.offset;
- if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
+ if ( (op == _EVAS_RENDER_COPY) || (op == _EVAS_RENDER_COPY_REL) ||
(op == _EVAS_RENDER_MASK) || (op == _EVAS_RENDER_MUL) )
masked_op = 1;
switch (gr->fill.spread)
===================================================================
RCS file:
/cvs/e/e17/libs/evas/src/lib/engines/common/evas_gradient_sinusoidal.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- evas_gradient_sinusoidal.c 14 Aug 2007 12:49:10 -0000 1.6
+++ evas_gradient_sinusoidal.c 19 Jul 2008 17:13:42 -0000 1.7
@@ -1,5 +1,11 @@
-#include "evas_common.h"
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+
#include <math.h>
+
+#include "evas_common.h"
+#include "evas_gradient_private.h"
typedef struct _Sinusoidal_Data Sinusoidal_Data;
struct _Sinusoidal_Data
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
