Enlightenment CVS committal
Author : sebastid
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/include
Modified Files:
Makefile.am evas_common.h
Added Files:
evas_macros.h
Log Message:
Move macros to separate header file.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 20 Mar 2005 23:44:22 -0000 1.6
+++ Makefile.am 20 Sep 2005 17:01:03 -0000 1.7
@@ -14,5 +14,6 @@
evas_cairo_common.h \
evas_mmx.h \
evas_options.h \
+evas_macros.h \
evas_private.h
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/evas/src/lib/include/evas_common.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- evas_common.h 7 Sep 2005 02:31:30 -0000 1.41
+++ evas_common.h 20 Sep 2005 17:01:03 -0000 1.42
@@ -14,78 +14,6 @@
/* #define RECTUPDATE */
#define TILESIZE 8
-#undef MIN
-#define MIN(_x, _y) \
-(((_x) < (_y)) ? (_x) : (_y))
-#undef MAX
-#define MAX(_x, _y) \
-(((_x) > (_y)) ? (_x) : (_y))
-
-#define POLY_EDGE_DEL(_i) \
-{ \
- int _j; \
- \
- for (_j = 0; (_j < num_active_edges) && (edges[_j].i != _i); _j++); \
- if (_j < num_active_edges) \
- { \
- num_active_edges--; \
- memmove(&(edges[_j]), &(edges[_j + 1]), \
- (num_active_edges - _j) * sizeof(RGBA_Edge)); \
- } \
-}
-
-#define POLY_EDGE_ADD(_i, _y) \
-{ \
- int _j; \
- float _dx; \
- RGBA_Vertex *_p, *_q; \
- if (_i < (n - 1)) _j = _i + 1; \
- else _j = 0; \
- if (point[_i].y < point[_j].y) \
- { \
- _p = &(point[_i]); \
- _q = &(point[_j]); \
- } \
- else \
- { \
- _p = &(point[_j]); \
- _q = &(point[_i]); \
- } \
- edges[num_active_edges].dx = _dx = (_q->x - _p->x) / (_q->y - _p->y); \
- edges[num_active_edges].x = (_dx * ((float)_y + 0.5 - _p->y)) + _p->x; \
- edges[num_active_edges].i = _i; \
- num_active_edges++; \
-}
-
-#define INTERP_VAL(out, in1, in2, in3, in4, interp_x, interp_y) \
- { \
- int _v, _vv; \
- \
- _v = (256 - (interp_x)) * (in1); \
- if ((interp_x) > 0) _v += (interp_x) * (in2); \
- _v *= (256 - (interp_y)); \
- if ((interp_y) > 0) \
- { \
- _vv = (256 - (interp_x)) * (in3); \
- if ((interp_x) > 0) _vv += (interp_x) * (in4); \
- _vv *= (interp_y); \
- (out) = ((_v + _vv) >> 16); \
- } \
- else (out) = (_v >> 16); \
- }
-#define INTERP_2(in1, in2, interp, interp_inv) \
- ((in1 * interp_inv) + (in2 * interp)) >> 8
-
-#define SWAP32(x) (x) = \
- ((((x) & 0x000000ff ) << 24) |\
- (((x) & 0x0000ff00 ) << 8) |\
- (((x) & 0x00ff0000 ) >> 8) |\
- (((x) & 0xff000000 ) >> 24))
-
-#define SWAP16(x) (x) = \
- ((((x) & 0x00ff ) << 8) |\
- (((x) & 0xff00 ) >> 8))
-
#ifdef BUILD_SMALL_DITHER_MASK
# define DM_TABLE _evas_dither_44
# define DM_SIZE 4
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
