summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorculler <culler>2024-07-19 05:03:49 (GMT)
committerculler <culler>2024-07-19 05:03:49 (GMT)
commit5c101e5d1c2a0b9240082d7c90b7a496b603a93b (patch)
treea5db598243d870b03dba9898624b490bcc6e4ea4
parent52aa91a44c447c1641518dfb622155c09761c6bc (diff)
parenta7042bc073cde4769058cf3d511ef07ef14493fd (diff)
downloadtk-5c101e5d1c2a0b9240082d7c90b7a496b603a93b.zip
tk-5c101e5d1c2a0b9240082d7c90b7a496b603a93b.tar.gz
tk-5c101e5d1c2a0b9240082d7c90b7a496b603a93b.tar.bz2
Merge core-8-6-branch
-rw-r--r--generic/tkObj.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkObj.c b/generic/tkObj.c
index 170f7d0..c7c1d57 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.c
@@ -284,7 +284,7 @@ GetPixelsFromObjEx(
double d;
PixelRep *pixelPtr;
static const double bias[] = {
- 1.0, 10.0, 25.4, 0.35278 /*25.4 / 72.0*/
+ 1.0, 10.0, 25.4, 25.4 / 72.0
};
if (objPtr->typePtr != &pixelObjType.objType) {