summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorculler <culler>2024-07-23 01:50:45 (GMT)
committerculler <culler>2024-07-23 01:50:45 (GMT)
commitbcc86a6c8e1a73f8170d776fff67b0646980fd1c (patch)
tree666acc467ec19673a0a9ee9edac2001293506e4f
parent9e20c5a97166e97d96a3416f750d5027f80ae3a7 (diff)
parent41f0cfd749135c680a974eef07475bc2a6ebe94f (diff)
downloadtk-bcc86a6c8e1a73f8170d776fff67b0646980fd1c.zip
tk-bcc86a6c8e1a73f8170d776fff67b0646980fd1c.tar.gz
tk-bcc86a6c8e1a73f8170d776fff67b0646980fd1c.tar.bz2
Merge core-8-branch
-rw-r--r--generic/tkObj.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tkObj.c b/generic/tkObj.c
index b96ee75..587a655 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.c
@@ -255,7 +255,7 @@ GetPixelsFromObjEx(
double d;
PixelRep *pixelPtr;
static const double bias[] = {
- 1.0L, 10.0L, 25.4L, 3.527777777777777777L /*25.4 / 72.0*/
+ 1.0L, 10.0L, 25.4L, 0.3527777777777777777L /*25.4 / 72.0*/
};
if (objPtr->typePtr != &pixelObjType.objType) {
@@ -613,7 +613,7 @@ Tk_GetMMFromObj(
double d;
MMRep *mmPtr;
static const double bias[] = {
- 10.0, 25.4, 1.0, 0.352777777777777777 /*25.4 / 72.0*/
+ 10.0L, 25.4L, 1.0L, 0.352777777777777777L /*25.4 / 72.0*/
};
if (objPtr->typePtr != &mmObjType.objType) {