summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2012-03-07 14:25:24 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2012-03-07 14:25:24 (GMT)
commitcaa178407bf99803afd0702ce1225cda259ccc73 (patch)
tree9e54688720c5829660d87bab64646b8ff3db701e /generic
parent737dfa9bcb107e65f0a5070c248eeffc9b48a029 (diff)
parent1315c522b0ca1b7e4ebb733c2bfbf4290ac3ecb6 (diff)
downloadtk-caa178407bf99803afd0702ce1225cda259ccc73.zip
tk-caa178407bf99803afd0702ce1225cda259ccc73.tar.gz
tk-caa178407bf99803afd0702ce1225cda259ccc73.tar.bz2
* generic/tkObj.c (GetPixelsFromObjEx): [Bug 3497848]: Better rounding
of pixel values to integers.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkObj.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/generic/tkObj.c b/generic/tkObj.c
index 7affac4..2e45e0e 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.c
@@ -211,7 +211,7 @@ GetPixelsFromObjEx(
if (dblPtr != NULL) {
*dblPtr = d;
}
- *intPtr = (int) d;
+ *intPtr = (int) (d<0 ? d-0.5 : d+0.5);
return TCL_OK;
} else if (objPtr->typePtr == typeCache->intTypePtr) {
(void) Tcl_GetIntFromObj(interp, objPtr, intPtr);
@@ -253,11 +253,7 @@ GetPixelsFromObjEx(
d *= bias[pixelPtr->units] * WidthOfScreen(Tk_Screen(tkwin));
d /= WidthMMOfScreen(Tk_Screen(tkwin));
}
- if (d < 0) {
- pixelPtr->returnValue = (int) (d - 0.5);
- } else {
- pixelPtr->returnValue = (int) (d + 0.5);
- }
+ pixelPtr->returnValue = (int) (d<0 ? d-0.5 : d+0.5);
pixelPtr->tkwin = tkwin;
if (dblPtr) {
*dblPtr = d;