summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2010-01-05 08:49:47 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2010-01-05 08:49:47 (GMT)
commitaacf8d739e27f7131d0a7322da993ba8158df5e6 (patch)
treeb53ca9c943b91ed43676acd0f73612577ebae655 /generic
parenta580567464cda1d5a6116339acc707e451e7854e (diff)
downloadtk-aacf8d739e27f7131d0a7322da993ba8158df5e6.zip
tk-aacf8d739e27f7131d0a7322da993ba8158df5e6.tar.gz
tk-aacf8d739e27f7131d0a7322da993ba8158df5e6.tar.bz2
Corrected rounding of coordinates when working with fonts. [Bug 2824916]
Diffstat (limited to 'generic')
-rw-r--r--generic/tkFont.c4
-rw-r--r--generic/tkFont.h8
2 files changed, 8 insertions, 4 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c
index 56018af..54b3afa 100644
--- a/generic/tkFont.c
+++ b/generic/tkFont.c
@@ -10,14 +10,12 @@
* 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.64 2010/01/03 21:21:33 patthoyts Exp $
+ * RCS: @(#) $Id: tkFont.c,v 1.65 2010/01/05 08:49:49 dkf 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
diff --git a/generic/tkFont.h b/generic/tkFont.h
index 5a16d01..ebf5bca 100644
--- a/generic/tkFont.h
+++ b/generic/tkFont.h
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkFont.h,v 1.13 2008/11/05 23:29:58 nijtmans Exp $
+ * RCS: @(#) $Id: tkFont.h,v 1.14 2010/01/05 08:49:49 dkf Exp $
*/
#ifndef _TKFONT
@@ -189,6 +189,12 @@ typedef struct TkXLFDAttributes {
#define XLFD_NUMFIELDS 13 /* Number of fields in XLFD. */
/*
+ * Helper macro. How to correctly round a double to a short.
+ */
+
+#define ROUND16(x) ((short) round(x))
+
+/*
* Low-level API exported by generic code to platform-specific code.
*/