summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlvin Penner <penner@vaxxine.com>2014-04-14 22:33:10 +0000
committerapenner <penner@vaxxine.com>2014-04-14 22:33:10 +0000
commit4d22e8940aea81094e428e4a4c849bbc246e3b2c (patch)
tree591164f11d75afe7da69772b83e03d1d5cfbd15b
parentremove debug messages in desktop.cpp (diff)
downloadinkscape-4d22e8940aea81094e428e4a4c849bbc246e3b2c.tar.gz
inkscape-4d22e8940aea81094e428e4a4c849bbc246e3b2c.zip
extensions. fix typo in unittouu conversion (Bug 1307691)
Fixed bugs: - https://launchpad.net/bugs/1307691 (bzr r13288)
-rwxr-xr-xshare/extensions/inkex.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/share/extensions/inkex.py b/share/extensions/inkex.py
index d71b7d7e7..947cb5b30 100755
--- a/share/extensions/inkex.py
+++ b/share/extensions/inkex.py
@@ -285,8 +285,8 @@ class Effect:
return 'px'
#a dictionary of unit to user unit conversion factors
- __uuconv = {'in':90.0, 'pt':1.25, 'px':1, 'mm':3.5433070866, 'cm':35.433070866, 'm':3543.3070866,
- 'km':3543307.0866, 'pc':15.0, 'yd':3240 , 'ft':1080}
+ __uuconv = {'in':90.0, 'pt':1.25, 'px':1.0, 'mm':3.5433070866, 'cm':35.433070866, 'm':3543.3070866,
+ 'km':3543307.0866, 'pc':15.0, 'yd':3240.0 , 'ft':1080.0}
def unittouu(self, string):
'''Returns userunits given a string representation of units in another system'''
unit = re.compile('(%s)$' % '|'.join(self.__uuconv.keys()))