summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorferrieux <ferrieux@users.sourceforge.net>2008-11-28 17:05:59 (GMT)
committerferrieux <ferrieux@users.sourceforge.net>2008-11-28 17:05:59 (GMT)
commit531d5cc55f2e07e5fc99c4c1fba0479219289a3e (patch)
tree8467f79dfbcd9032d7d6b5d7552484fcfded7f8f
parent4fd8dbd64ac0f6c7678865c51e5bd3e5be75d36c (diff)
downloadtk-531d5cc55f2e07e5fc99c4c1fba0479219289a3e.zip
tk-531d5cc55f2e07e5fc99c4c1fba0479219289a3e.tar.gz
tk-531d5cc55f2e07e5fc99c4c1fba0479219289a3e.tar.bz2
Fix stupid bug in millimeter patch (conditionally uninited var)
-rw-r--r--generic/tkObj.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/generic/tkObj.c b/generic/tkObj.c
index c8bc746..8ca2104 100644
--- a/generic/tkObj.c
+++ b/generic/tkObj.c
@@ -8,7 +8,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkObj.c,v 1.23 2008/11/27 23:47:09 ferrieux Exp $
+ * RCS: @(#) $Id: tkObj.c,v 1.24 2008/11/28 17:05:59 ferrieux Exp $
*/
#include "tkInt.h"
@@ -267,6 +267,8 @@ Tk_GetDoublePixelsFromObj(
/* internally "shimmer" to pixel units */
pixelPtr->units=-1;
pixelPtr->value=d;
+ } else {
+ d=pixelPtr->value;
}
}
*doublePtr = d;