Enlightenment CVS committal
Author : kwo
Project : e17
Module : libs/imlib2
Dir : e17/libs/imlib2/src/lib
Modified Files:
api.c ellipse.c line.c polygon.c rgbadraw.h span.c
Log Message:
Make code indentable.
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/lib/api.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- api.c 19 May 2007 18:32:34 -0000 1.13
+++ api.c 20 May 2007 12:49:43 -0000 1.14
@@ -4821,14 +4821,15 @@
return; // If size is wrong
else sz = im->w; // update sz with real width
- /* Not neccesary 'cause destination is context
+#if 0 /* Not neccesary 'cause destination is context */
im = __imlib_CreateImage(sz, sz, NULL);
im->data = calloc(sz * sz, sizeof(DATA32));
if (!(im->data))
{
__imlib_FreeImage(im);
return;
- }*/
+ }
+#endif
if (ctx->anti_alias)
{
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/lib/ellipse.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ellipse.c 1 Nov 2004 09:45:31 -0000 1.1
+++ ellipse.c 20 May 2007 12:49:43 -0000 1.2
@@ -188,8 +188,8 @@
if (ca < 255)
{
- MULT(A_VAL(&col0), ca, A_VAL(&col0), tmp)
- MULT(A_VAL(&col1), ca, A_VAL(&col1), tmp)
+ MULT(A_VAL(&col0), ca, A_VAL(&col0), tmp);
+ MULT(A_VAL(&col1), ca, A_VAL(&col1), tmp);
}
len = rx - lx;
@@ -257,8 +257,8 @@
if (ca < 255)
{
- MULT(A_VAL(&col0), ca, A_VAL(&col0), tmp)
- MULT(A_VAL(&col1), ca, A_VAL(&col1), tmp)
+ MULT(A_VAL(&col0), ca, A_VAL(&col0), tmp);
+ MULT(A_VAL(&col1), ca, A_VAL(&col1), tmp);
}
len = rx - lx;
@@ -518,7 +518,7 @@
A_VAL(&col1) = ((yy - (y << 16)) >> 8);
if (ca < 255)
- MULT(A_VAL(&col1), ca, A_VAL(&col1), tmp)
+ MULT(A_VAL(&col1), ca, A_VAL(&col1), tmp);
len = rx - lx;
@@ -586,7 +586,7 @@
A_VAL(&col1) = ((xx - (x << 16)) >> 8);
if (ca < 255)
- MULT(A_VAL(&col1), ca, A_VAL(&col1), tmp)
+ MULT(A_VAL(&col1), ca, A_VAL(&col1), tmp);
len = rx - lx;
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/lib/line.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- line.c 8 Dec 2006 12:56:44 -0000 1.2
+++ line.c 20 May 2007 12:49:43 -0000 1.3
@@ -8,7 +8,7 @@
#define EXCHANGE_POINTS(x0, y0, x1, y1) \
-{ \
+do { \
int _tmp = y0; \
\
y0 = y1; \
@@ -17,7 +17,7 @@
_tmp = x0; \
x0 = x1; \
x1 = _tmp; \
-}
+} while (0)
ImlibUpdate *
@@ -69,7 +69,7 @@
if (A_VAL(&color) == 0xff) blend = 0;
if (y0 > y1)
- EXCHANGE_POINTS(x0, y0, x1, y1)
+ EXCHANGE_POINTS(x0, y0, x1, y1);
dx = x1 - x0;
dy = y1 - y0;
@@ -223,10 +223,11 @@
}
-#define SETUP_LINE_SHALLOW \
+#define SETUP_LINE_SHALLOW() \
+do { \
if (x0 > x1) \
{ \
- EXCHANGE_POINTS(x0, y0, x1, y1) \
+ EXCHANGE_POINTS(x0, y0, x1, y1); \
dx = -dx; \
dy = -dy; \
} \
@@ -295,13 +296,15 @@
prev_y = (yy >> 16); \
\
rx = MIN(x1 + 1, clw); \
- by = clh - 1;
+ by = clh - 1; \
+} while (0)
-#define SETUP_LINE_STEEP \
+#define SETUP_LINE_STEEP() \
+do { \
if (y0 > y1) \
{ \
- EXCHANGE_POINTS(x0, y0, x1, y1) \
+ EXCHANGE_POINTS(x0, y0, x1, y1); \
dx = -dx; \
dy = -dy; \
} \
@@ -367,7 +370,8 @@
prev_x = (xx >> 16); \
\
by = MIN(y1 + 1, clh); \
- rx = clw - 1;
+ rx = clw - 1; \
+} while (0)
@@ -406,7 +410,7 @@
/* shallow: x-parametric */
if (abs(dy) < abs(dx))
{
- SETUP_LINE_SHALLOW
+ SETUP_LINE_SHALLOW();
*cl_x0 = px + clx;
*cl_y0 = py + cly;
@@ -444,7 +448,7 @@
/* steep: y-parametric */
- SETUP_LINE_STEEP
+ SETUP_LINE_STEEP();
*cl_x0 = px + clx;
*cl_y0 = py + cly;
@@ -515,7 +519,7 @@
/* shallow: x-parametric */
if (abs(dy) < abs(dx))
{
- SETUP_LINE_SHALLOW
+ SETUP_LINE_SHALLOW();
*cl_x0 = px + clx;
*cl_y0 = py + cly;
@@ -545,7 +549,7 @@
A_VAL(&color) = 255 - aa;
if (ca < 255)
- MULT(A_VAL(&color), ca, A_VAL(&color), tmp)
+ MULT(A_VAL(&color), ca, A_VAL(&color), tmp);
if ((unsigned)(py) < clh)
pfunc(color, p);
@@ -554,7 +558,7 @@
{
A_VAL(&color) = aa;
if (ca < 255)
- MULT(A_VAL(&color), ca, A_VAL(&color), tmp)
+ MULT(A_VAL(&color), ca, A_VAL(&color), tmp);
pfunc(color, p + dstw);
}
}
@@ -572,7 +576,7 @@
/* steep: y-parametric */
- SETUP_LINE_STEEP
+ SETUP_LINE_STEEP();
*cl_x0 = px + clx;
*cl_y0 = py + cly;
@@ -602,7 +606,7 @@
A_VAL(&color) = 255 - aa;
if (ca < 255)
- MULT(A_VAL(&color), ca, A_VAL(&color), tmp)
+ MULT(A_VAL(&color), ca, A_VAL(&color), tmp);
if ((unsigned)(px) < clw)
pfunc(color, p);
@@ -611,7 +615,7 @@
{
A_VAL(&color) = aa;
if (ca < 255)
- MULT(A_VAL(&color), ca, A_VAL(&color), tmp)
+ MULT(A_VAL(&color), ca, A_VAL(&color), tmp);
pfunc(color, p + 1);
}
}
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/lib/polygon.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- polygon.c 19 May 2007 18:32:34 -0000 1.4
+++ polygon.c 20 May 2007 12:49:43 -0000 1.5
@@ -250,7 +250,7 @@
/* general macros */
#define DEL_EDGE(j) \
-{ \
+do { \
int m; \
for (m = 0; (m < nactive_edges) && (edge[m].index != (j)); m++); \
\
@@ -261,10 +261,10 @@
memmove(edge + m, edge + m + 1, \
(nactive_edges - m) * sizeof(PolyEdge)); \
} \
-}
+} while (0)
-#define DEL_HORZ_EDGES \
-{ \
+#define DEL_HORZ_EDGES() \
+do { \
int m = 0; \
\
while (m < nactive_edges) \
@@ -279,11 +279,11 @@
m++; \
} \
nactive_horz_edges = 0; \
-}
+} while (0)
#define ADD_EDGE(i) \
-{ \
+do { \
int m; \
\
for (m = 0; (m < nactive_edges) && (edge[m].index != i); m++); \
@@ -339,10 +339,11 @@
ne->v1 = v1; \
nactive_edges++; \
}
\
-}
+} while (0)
#define GET_EDGE_RANGE(e, elx, erx) \
+do { \
switch(e->type) \
{ \
case SHALLOW_EDGE: \
@@ -367,27 +368,33 @@
}
\
default: \
break; \
- }
+ } \
+} while (0)
#define CLIP_SPAN(lx, rx, clx, clrx) \
+do { \
if (lx < (clx)) lx = (clx); \
- if (rx > (clrx)) rx = (clrx);
+ if (rx > (clrx)) rx = (clrx); \
+} while (0)
#define BLEND_ALPHA(dst, a, tmp) \
+do { \
if (*dst) \
{ \
tmp = ((a) * (255 - (*(dst)))) + 0x80; \
*(dst) += ((tmp + (tmp >> 8)) >> 8); \
} \
else \
- *(dst) = (a);
+ *(dst) = (a); \
+} while (0)
/* initializing macro used in drawing/filling functions */
-#define INIT_POLY \
+#define INIT_POLY() \
+do { \
sfunc = __imlib_GetShapedSpanDrawFunction(op, dst_alpha, blend); \
if (!sfunc) return;
\
\
@@ -397,10 +404,10 @@
clrx = clx + clw - 1; \
clby = cly + clh - 1; \
\
- CLIP_SPAN(clx, clrx, poly->lx, a_a + poly->rx) \
+ CLIP_SPAN(clx, clrx, poly->lx, a_a + poly->rx); \
if (clrx < clx) return; \
\
- CLIP_SPAN(cly, clby, poly->ty, poly->by) \
+ CLIP_SPAN(cly, clby, poly->ty, poly->by); \
if (clby < cly) return; \
\
clw = clrx - clx + 1; \
@@ -449,16 +456,19 @@
k = 0; \
nactive_edges = 0; \
nactive_horz_edges = 0; \
- y = ty;
+ y = ty; \
+} while (0)
-#define DE_INIT_POLY \
+#define DE_INIT_POLY() \
+do { \
free(edge); \
free(ysort); \
s0 += clx; \
free(s0); \
s1 += clx; \
- free(s1);
+ free(s1); \
+} while (0)
@@ -484,7 +494,7 @@
DATA32 *p;
DATA8 *s0, *s1, *ps;
- INIT_POLY
+ INIT_POLY();
while (y <= by)
{
@@ -501,9 +511,9 @@
if (j >= 0)
{
if (poly->points[j].y < y)
- DEL_EDGE(j)
+ DEL_EDGE(j);
else
- ADD_EDGE(j)
+ ADD_EDGE(j);
}
j = i + 1;
@@ -513,9 +523,9 @@
if (j < nvertices)
{
if (poly->points[j].y < y)
- DEL_EDGE(i)
+ DEL_EDGE(i);
else
- ADD_EDGE(i)
+ ADD_EDGE(i);
}
k++;
@@ -541,7 +551,7 @@
e = edge + j;
- GET_EDGE_RANGE(e, e_lx, e_rx)
+ GET_EDGE_RANGE(e, e_lx, e_rx);
if ((e_lx < e->v0->x) && (e->dxx > 0))
e_lx = e->v0->x;
if ((e_rx > e->v0->x) && (e->dxx < 0))
@@ -668,10 +678,10 @@
}
if (nactive_horz_edges > 0)
- DEL_HORZ_EDGES
+ DEL_HORZ_EDGES();
/* draw alpha buffer to dst */
- CLIP_SPAN(x0, x1, clx, clrx)
+ CLIP_SPAN(x0, x1, clx, clrx);
if ((x0 <= x1) && (y >= cly))
sfunc(s0 + x0, color, p + x0, x1 - x0 + 1);
@@ -682,7 +692,7 @@
p += dstw;
}
- DE_INIT_POLY
+ DE_INIT_POLY();
}
@@ -704,7 +714,7 @@
DATA32 *p;
DATA8 *s0, *s1, *ps;
- INIT_POLY
+ INIT_POLY();
yy = y << 16;
prev_y = y - 1;
@@ -725,9 +735,9 @@
if (j >= 0)
{
if (poly->points[j].y < y)
- DEL_EDGE(j)
+ DEL_EDGE(j);
else
- ADD_EDGE(j)
+ ADD_EDGE(j);
}
j = i + 1;
@@ -737,9 +747,9 @@
if (j < nvertices)
{
if (poly->points[j].y <= y)
- DEL_EDGE(i)
+ DEL_EDGE(i);
else
- ADD_EDGE(i)
+ ADD_EDGE(i);
}
k++;
@@ -765,7 +775,7 @@
e = edge + j;
- GET_EDGE_RANGE(e, e_lx, e_rx)
+ GET_EDGE_RANGE(e, e_lx, e_rx);
if ((e_lx < e->v0->x) && (e->dxx > 0))
e_lx = e->v0->x;
if ((e_rx > e->v0->x) && (e->dxx < 0))
@@ -783,14 +793,14 @@
if (IN_SEGMENT(rx, clx, clw))
{
ps = s0 + rx;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
if (rx > x1) x1 = rx;
}
if (IN_SEGMENT(e_lx, clx, clw))
{
aa = 255 - aa;
ps = s0 + e_lx;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
if (e_lx < x0) x0 = e_lx;
}
@@ -802,14 +812,14 @@
if (IN_SEGMENT(rx, clx, clw))
{
ps = s1 + rx;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
if (rx > nx1) nx1 = rx;
}
if (IN_SEGMENT(lx, clx, clw))
{
aa = 255 - aa;
ps = s1 + lx;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
if (lx < nx0) nx0 = lx;
}
}
@@ -836,7 +846,7 @@
{
aa = ((eyy - prev_yy) >> 8);
ps = s0 + x;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
}
eyy += e->dyy;
ey = eyy >> 16;
@@ -851,7 +861,7 @@
{
aa = 255 - ((eyy - yy) >> 8);
ps = s0 + x;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
}
eyy += e->dyy;
ey = eyy >> 16;
@@ -874,7 +884,7 @@
{
aa = ((eyy - yy) >> 8);
ps = s1 + x;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
}
eyy += e->dyy;
ey = eyy >> 16;
@@ -894,7 +904,7 @@
{
aa = ((eyy - prev_yy) >> 8);
ps = s0 + x;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
}
eyy -= e->dyy;
ey = eyy >> 16;
@@ -909,7 +919,7 @@
{
aa = 255 - ((eyy - yy) >> 8);
ps = s0 + x;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
}
eyy -= e->dyy;
ey = eyy >> 16;
@@ -932,7 +942,7 @@
{
aa = ((eyy - yy) >> 8);
ps = s1 + x;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
}
eyy -= e->dyy;
ey = eyy >> 16;
@@ -965,10 +975,10 @@
}
if (nactive_horz_edges > 0)
- DEL_HORZ_EDGES
+ DEL_HORZ_EDGES();
/* draw alpha buffer to dst */
- CLIP_SPAN(x0, x1, clx, clrx)
+ CLIP_SPAN(x0, x1, clx, clrx);
if ((x0 <= x1) && (y >= cly))
sfunc(s0 + x0, color, p + x0, x1 - x0 + 1);
@@ -984,7 +994,7 @@
p += dstw;
}
- DE_INIT_POLY
+ DE_INIT_POLY();
}
@@ -1064,7 +1074,7 @@
DATA32 *p;
DATA8 *s0, *s1, *ps;
- INIT_POLY
+ INIT_POLY();
while (y <= by)
{
@@ -1078,17 +1088,17 @@
else j = nvertices - 1;
if (poly->points[j].y < y)
- DEL_EDGE(j)
+ DEL_EDGE(j);
else
- ADD_EDGE(j)
+ ADD_EDGE(j);
if (i < (nvertices - 1)) j = i + 1;
else j = 0;
if (poly->points[j].y < y)
- DEL_EDGE(i)
+ DEL_EDGE(i);
else
- ADD_EDGE(i)
+ ADD_EDGE(i);
k++;
}
@@ -1118,10 +1128,10 @@
else
{ re = le = edge; }
- GET_EDGE_RANGE(le, le_lx, le_rx)
+ GET_EDGE_RANGE(le, le_lx, le_rx);
if ((le_lx < le->v0->x) && (le->dxx > 0))
le_lx = le->v0->x;
- GET_EDGE_RANGE(re, re_lx, re_rx)
+ GET_EDGE_RANGE(re, re_lx, re_rx);
if ((re_rx > re->v0->x) && (re->dxx < 0))
re_rx = re->v0->x;
@@ -1301,7 +1311,7 @@
/* draw span between edges */
lx = le_rx; rx = re_lx;
- CLIP_SPAN(lx, rx, clx, clrx)
+ CLIP_SPAN(lx, rx, clx, clrx);
if ((lx <= rx) && (y >= cly))
memset(s0 + lx, 255, rx - lx + 1);
@@ -1313,10 +1323,10 @@
}
if (nactive_horz_edges > 0)
- DEL_HORZ_EDGES
+ DEL_HORZ_EDGES();
/* draw alpha buffer to dst */
- CLIP_SPAN(x0, x1, clx, clrx)
+ CLIP_SPAN(x0, x1, clx, clrx);
if ((x0 <= x1) && (y >= cly))
sfunc(s0 + x0, color, p + x0, x1 - x0 + 1);
@@ -1327,7 +1337,7 @@
p += dstw;
}
- DE_INIT_POLY
+ DE_INIT_POLY();
}
@@ -1349,7 +1359,7 @@
DATA32 *p;
DATA8 *s0, *s1, *ps;
- INIT_POLY
+ INIT_POLY();
yy = y << 16;
prev_y = y - 1;
@@ -1367,17 +1377,17 @@
else j = nvertices - 1;
if (poly->points[j].y < y)
- DEL_EDGE(j)
+ DEL_EDGE(j);
else
- ADD_EDGE(j)
+ ADD_EDGE(j);
if (i < (nvertices - 1)) j = i + 1;
else j = 0;
if (poly->points[j].y < y)
- DEL_EDGE(i)
+ DEL_EDGE(i);
else
- ADD_EDGE(i)
+ ADD_EDGE(i);
k++;
}
@@ -1406,10 +1416,10 @@
else
{ re = le = edge; }
- GET_EDGE_RANGE(le, le_lx, le_rx)
+ GET_EDGE_RANGE(le, le_lx, le_rx);
if ((le_lx < le->v0->x) && (le->dxx > 0))
le_lx = le->v0->x;
- GET_EDGE_RANGE(re, re_lx, re_rx)
+ GET_EDGE_RANGE(re, re_lx, re_rx);
if ((re_rx > re->v0->x) && (re->dxx < 0))
re_rx = re->v0->x;
@@ -1427,7 +1437,7 @@
{
aa = 255 - ((le->xx - (le_lx << 16)) >> 8);
ps = s0 + le_lx;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
}
if ((le->v1->y == (y + 1)) && (y < clby))
@@ -1437,7 +1447,7 @@
{
aa = 255 - ((le->xx + le->dxx - (lx << 16)) >> 8);
ps = s1 + lx;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
if (lx < nx0) nx0 = lx;
}
}
@@ -1462,7 +1472,7 @@
{
aa = ((eyy - prev_yy) >> 8);
ps = s0 + x;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
}
eyy += le->dyy;
ey = eyy >> 16;
@@ -1482,7 +1492,7 @@
{
aa = ((eyy - yy) >> 8);
ps = s1 + x;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
}
eyy += le->dyy;
ey = eyy >> 16;
@@ -1500,7 +1510,7 @@
{
aa = 255 - ((eyy - yy) >> 8);
ps = s0 + x;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
}
eyy += le->dyy;
ey = eyy >> 16;
@@ -1541,7 +1551,7 @@
{
aa = (re->xx - (re_lx << 16)) >> 8;
ps = s0 + rx;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
}
if ((re->v1->y == (y + 1)) && (y < clby))
@@ -1551,7 +1561,7 @@
{
aa = ((re->xx + re->dxx - (lx << 16)) >> 8);
ps = s1 + rx;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
if (rx > nx1) nx1 = rx;
}
}
@@ -1576,7 +1586,7 @@
{
aa = 255 - ((eyy - yy) >> 8);
ps = s0 + x;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
}
eyy -= re->dyy;
ey = eyy >> 16;
@@ -1594,7 +1604,7 @@
{
aa = ((eyy - prev_yy) >> 8);
ps = s0 + x;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
}
eyy -= re->dyy;
ey = eyy >> 16;
@@ -1614,7 +1624,7 @@
{
aa = ((eyy - yy) >> 8);
ps = s1 + x;
- BLEND_ALPHA(ps, aa, tmp)
+ BLEND_ALPHA(ps, aa, tmp);
}
eyy -= re->dyy;
ey = eyy >> 16;
@@ -1643,7 +1653,7 @@
/* draw span between edges */
lx = le_rx; rx = re_lx;
- CLIP_SPAN(lx, rx, clx, clrx)
+ CLIP_SPAN(lx, rx, clx, clrx);
if ((lx <= rx) && (y >= cly))
memset(s0 + lx, 255, rx - lx + 1);
@@ -1655,10 +1665,10 @@
}
if (nactive_horz_edges > 0)
- DEL_HORZ_EDGES
+ DEL_HORZ_EDGES();
/* draw alpha buffer to dst */
- CLIP_SPAN(x0, x1, clx, clrx)
+ CLIP_SPAN(x0, x1, clx, clrx);
if ((x0 <= x1) && (y >= cly))
sfunc(s0 + x0, color, p + x0, x1 - x0 + 1);
@@ -1674,7 +1684,7 @@
p += dstw;
}
- DE_INIT_POLY
+ DE_INIT_POLY();
}
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/lib/rgbadraw.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- rgbadraw.h 9 Apr 2006 08:12:51 -0000 1.2
+++ rgbadraw.h 20 May 2007 12:49:43 -0000 1.3
@@ -25,10 +25,10 @@
}
#define DIV_255(a, x, tmp) \
-{ \
+do { \
tmp = (x) + 0x80; \
a = (tmp + (tmp >> 8)) >> 8; \
-}
+} while (0)
#define MULT(na, a0, a1, tmp) \
DIV_255(na, (a0) * (a1), tmp)
===================================================================
RCS file: /cvs/e/e17/libs/imlib2/src/lib/span.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- span.c 1 Nov 2004 09:45:31 -0000 1.1
+++ span.c 20 May 2007 12:49:43 -0000 1.2
@@ -6,23 +6,31 @@
#define ADD_COPY(r, g, b, dest) \
+do { \
ADD_COLOR(R_VAL(dest), r, R_VAL(dest)); \
ADD_COLOR(G_VAL(dest), g, G_VAL(dest)); \
- ADD_COLOR(B_VAL(dest), b, B_VAL(dest));
+ ADD_COLOR(B_VAL(dest), b, B_VAL(dest)); \
+} while (0)
#define SUB_COPY(r, g, b, dest) \
+do { \
SUB_COLOR(R_VAL(dest), r, R_VAL(dest)); \
SUB_COLOR(G_VAL(dest), g, G_VAL(dest)); \
- SUB_COLOR(B_VAL(dest), b, B_VAL(dest));
+ SUB_COLOR(B_VAL(dest), b, B_VAL(dest)); \
+} while (0)
#define RE_COPY(r, g, b, dest) \
+do { \
RESHADE_COLOR(R_VAL(dest), r, R_VAL(dest)); \
RESHADE_COLOR(G_VAL(dest), g, G_VAL(dest)); \
- RESHADE_COLOR(B_VAL(dest), b, B_VAL(dest));
+ RESHADE_COLOR(B_VAL(dest), b, B_VAL(dest)); \
+} while (0)
#define MULT(na, a0, a1, tmp) \
- tmp = ((a0) * (a1)) + 0x80; \
- na = (tmp + (tmp >> 8)) >> 8;
+do { \
+ tmp = ((a0) * (a1)) + 0x80; \
+ na = (tmp + (tmp >> 8)) >> 8; \
+} while (0)
extern DATA8 pow_lut[256][256];
@@ -621,7 +629,7 @@
DATA32 tmp;
if (*src)
- { ADD_COPY(R_VAL(&color), G_VAL(&color), B_VAL(&color), dst) }
+ { ADD_COPY(R_VAL(&color), G_VAL(&color), B_VAL(&color), dst); }
src++; dst++;
}
@@ -790,7 +798,7 @@
DATA32 tmp;
if (*src)
- { SUB_COPY(R_VAL(&color), G_VAL(&color), B_VAL(&color), dst) }
+ { SUB_COPY(R_VAL(&color), G_VAL(&color), B_VAL(&color), dst); }
src++; dst++;
}
@@ -959,7 +967,7 @@
DATA32 tmp;
if (*src)
- { RE_COPY(R_VAL(&color), G_VAL(&color), B_VAL(&color), dst) }
+ { RE_COPY(R_VAL(&color), G_VAL(&color), B_VAL(&color), dst); }
src++; dst++;
}
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
