frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the use of ICEIL slightly less ugly.

This commit is contained in:
Adam Jackson 2007-05-09 18:38:33 -04:00
parent 178d426311
commit 6ff239cb4e
5 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/xaa/xaaWideLine.c
View File

@ -32,10 +32,6 @@ Original mi code written by Keith Packard.
#include "xaa.h" #include "xaa.h"
#include "xaalocal.h" #include "xaalocal.h"
#ifdef ICEILTEMPDECL
ICEILTEMPDECL
#endif
#define DRAW_POINT(pScrn, x, y) \ #define DRAW_POINT(pScrn, x, y) \
if(hardClip) (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, 1, 1); \ if(hardClip) (*infoRec->SubsequentSolidFillRect)(pScrn, x, y, 1, 1); \
else XAAPointHelper(pScrn, x, y) else XAAPointHelper(pScrn, x, y)

4
mi/miarc.c
View File

@ -77,10 +77,6 @@ static double miDasin(double v);
static double miDatan2(double dy, double dx); static double miDatan2(double dy, double dx);
double cbrt(double); double cbrt(double);
#ifdef ICEILTEMPDECL
ICEILTEMPDECL
#endif
/* /*
* some interesting sematic interpretation of the protocol: * some interesting sematic interpretation of the protocol:
* *

13
mi/mifpoly.h
View File

@ -48,6 +48,8 @@ SOFTWARE.
#ifndef __MIFPOLY_H__ #ifndef __MIFPOLY_H__
#define __MIFPOLY_H__ #define __MIFPOLY_H__
#include <X11/Xfuncproto.h>
#define EPSILON 0.000001 #define EPSILON 0.000001
#define ISEQUAL(a,b) (Fabs((a) - (b)) <= EPSILON) #define ISEQUAL(a,b) (Fabs((a) - (b)) <= EPSILON)
#define UNEQUAL(a,b) (Fabs((a) - (b)) > EPSILON) #define UNEQUAL(a,b) (Fabs((a) - (b)) > EPSILON)
@ -66,20 +68,11 @@ SOFTWARE.
#define SQSECANT 108.856472512142 /* 1/sin^2(11/2) - for 11o miter cutoff */ #define SQSECANT 108.856472512142 /* 1/sin^2(11/2) - for 11o miter cutoff */
#define D2SECANT 5.21671526231167 /* 1/2*sin(11/2) - max extension per width */ #define D2SECANT 5.21671526231167 /* 1/2*sin(11/2) - max extension per width */
#ifdef NOINLINEICEIL static _X_INLINE int ICEIL(double x)
#define ICEIL(x) ((int)ceil(x))
#else
#ifdef __GNUC__
static __inline int ICEIL(double x)
{ {
int _cTmp = x; int _cTmp = x;
return ((x == _cTmp) || (x < 0.0)) ? _cTmp : _cTmp+1; return ((x == _cTmp) || (x < 0.0)) ? _cTmp : _cTmp+1;
} }
#else
#define ICEIL(x) ((((x) == (_cTmp = (x))) || ((x) < 0.0)) ? _cTmp : _cTmp+1)
#define ICEILTEMPDECL static int _cTmp;
#endif
#endif
/* Point with sub-pixel positioning. In this case we use doubles, but /* Point with sub-pixel positioning. In this case we use doubles, but
* see mifpolycon.c for other suggestions * see mifpolycon.c for other suggestions

4
mi/mifpolycon.c
View File

@ -58,10 +58,6 @@ SOFTWARE.
static int GetFPolyYBounds(SppPointPtr pts, int n, double yFtrans, static int GetFPolyYBounds(SppPointPtr pts, int n, double yFtrans,
int *by, int *ty); int *by, int *ty);
#ifdef ICEILTEMPDECL
ICEILTEMPDECL
#endif
/* /*
* Written by Todd Newman; April. 1987. * Written by Todd Newman; April. 1987.
* *

4
mi/miwideline.c
View File

@ -52,10 +52,6 @@ from The Open Group.
#include "miwideline.h" #include "miwideline.h"
#include "mi.h" #include "mi.h"
#ifdef ICEILTEMPDECL
ICEILTEMPDECL
#endif
static void miLineArc(DrawablePtr pDraw, GCPtr pGC, static void miLineArc(DrawablePtr pDraw, GCPtr pGC,
unsigned long pixel, SpanDataPtr spanData, unsigned long pixel, SpanDataPtr spanData,
LineFacePtr leftFace, LineFacePtr leftFace,