diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:12 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:12 +0000 |
| commit | f89fab68e29e3a4367e550fa25b75bba433f789d (patch) | |
| tree | 37e61cb486600aa90bff3730a77198b9ff133707 | |
| parent | c2d9049f759946f8bdeeb8780db6e2f51b83419c (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branch
| -rw-r--r-- | RenderLogo.c | 15 | ||||
| -rw-r--r-- | xlogo.man | 4 |
2 files changed, 9 insertions, 10 deletions
diff --git a/RenderLogo.c b/RenderLogo.c index ce8c462..d99a702 100644 --- a/RenderLogo.c +++ b/RenderLogo.c @@ -25,10 +25,9 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/programs/xlogo/RenderLogo.c,v 1.2 2002/10/19 19:15:32 herrb Exp $ */ +/* $XFree86: xc/programs/xlogo/RenderLogo.c,v 1.4 2003/05/29 15:20:57 tsi Exp $ */ #include <stdio.h> -#include <math.h> #include <X11/Xlib.h> #include <X11/extensions/Xrender.h> @@ -152,12 +151,12 @@ intersect(XLineDouble *l1, XLineDouble *l2, XPointDouble *intersection) intersection->x = m1 * intersection->y + b1; check = m2 * intersection->y + b2; - if (fabs(check - intersection->x) > (1/(double)(1<<16))) { -#ifdef __GNUC__ - fprintf(stderr, "%s: intersection is off by: %f\n", __FUNCTION__, fabs(check - intersection->x)); -#else - fprintf(stderr, "intersect: intersection is off by %f\n", fabs(check - instersection->x)); -#endif + if (check >= intersection->x) + check -= intersection->x; + else + check = intersection->x - check; + if (check > (1/(double)(1<<16))) { + fprintf(stderr, "intersect: intersection is off by %f\n", check); } } @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xlogo/xlogo.man,v 1.10 2002/10/12 16:06:48 herrb Exp $ +.\" $XFree86: xc/programs/xlogo/xlogo.man,v 1.11 2003/05/24 15:26:19 herrb Exp $ .\" .TH XLOGO 1 __xorgversion__ .SH NAME @@ -41,7 +41,7 @@ following: .B \-render This option indicates that the logo should be drawn with anti-aliased edges using the RENDER extension. .TP 8 -.B \-shape +.B \-sharp If -render is also specified, this forces the edges to be rendered in sharp mode, (ie. 1-bit alpha channel). .TP 8 .B \-shape |