diff options
| author | patthoyts <patthoyts@users.sourceforge.net> | 2008-11-22 20:05:32 (GMT) |
|---|---|---|
| committer | patthoyts <patthoyts@users.sourceforge.net> | 2008-11-22 20:05:32 (GMT) |
| commit | d018f5251d22906500e7f6b867ba151fdd4f589d (patch) | |
| tree | 4c1f685abe81acb723e581ebb1a54635f639a27b /generic/tkFont.c | |
| parent | 08d210474dcf15c239160ca885bd7799ac618787 (diff) | |
| download | tk-d018f5251d22906500e7f6b867ba151fdd4f589d.zip tk-d018f5251d22906500e7f6b867ba151fdd4f589d.tar.gz tk-d018f5251d22906500e7f6b867ba151fdd4f589d.tar.bz2 | |
Fixed up complaints from MSVC engendered by the last commit. In particular replaced round() which is a C99 function.
Diffstat (limited to 'generic/tkFont.c')
| -rw-r--r-- | generic/tkFont.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index c3b0e72..961feac 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -10,12 +10,14 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkFont.c,v 1.49 2008/11/22 18:08:51 dkf Exp $ + * RCS: @(#) $Id: tkFont.c,v 1.50 2008/11/22 20:05:32 patthoyts Exp $ */ #include "tkInt.h" #include "tkFont.h" +#define ROUND16(x) ((short)((x) + 0.5)) + /* * The following structure is used to keep track of all the fonts that exist * in the current application. It must be stored in the TkMainInfo for the @@ -2454,10 +2456,10 @@ TkUnderlineAngledTextLayout( * minimizes roundoff errors. */ - points[0].x = x + round(xx*cosA + dy*sinA); - points[0].y = y + round(dy*cosA - xx*sinA); - points[1].x = x + round(xx*cosA + dy*sinA + width*cosA); - points[1].y = y + round(dy*cosA - xx*sinA - width*sinA); + points[0].x = x + ROUND16(xx*cosA + dy*sinA); + points[0].y = y + ROUND16(dy*cosA - xx*sinA); + points[1].x = x + ROUND16(xx*cosA + dy*sinA + width*cosA); + points[1].y = y + ROUND16(dy*cosA - xx*sinA - width*sinA); if (fontPtr->underlineHeight == 1) { /* * Thin underlines look better when rotated when drawn as a line @@ -2466,13 +2468,13 @@ TkUnderlineAngledTextLayout( XDrawLines(display, drawable, gc, points, 2, CoordModeOrigin); } else { - points[2].x = x + round(xx*cosA + dy*sinA + width*cosA + points[2].x = x + ROUND16(xx*cosA + dy*sinA + width*cosA - fontPtr->underlineHeight*sinA); - points[2].y = y + round(dy*cosA - xx*sinA - width*sinA + points[2].y = y + ROUND16(dy*cosA - xx*sinA - width*sinA + fontPtr->underlineHeight*cosA); - points[3].x = x + round(xx*cosA + dy*sinA + points[3].x = x + ROUND16(xx*cosA + dy*sinA - fontPtr->underlineHeight*sinA); - points[3].y = y + round(dy*cosA - xx*sinA + points[3].y = y + ROUND16(dy*cosA - xx*sinA + fontPtr->underlineHeight*cosA); points[4].x = points[0].x; points[4].y = points[0].y; |