summaryrefslogtreecommitdiffstats
path: root/src/svg/svg-length.cpp
diff options
context:
space:
mode:
authorMaximilian Albert <maximilian.albert@gmail.com>2008-02-03 14:56:48 +0000
committercilix42 <cilix42@users.sourceforge.net>2008-02-03 14:56:48 +0000
commit9724b32fccd5fd94c6ef1819a0794232b19e8af7 (patch)
treeba97134ce02768c938789057be6f3e45d48064e3 /src/svg/svg-length.cpp
parentFix dragging a connection in the filter effects dialog into the primitive typ... (diff)
downloadinkscape-9724b32fccd5fd94c6ef1819a0794232b19e8af7.tar.gz
inkscape-9724b32fccd5fd94c6ef1819a0794232b19e8af7.zip
Make units pc (pica) and ft (feet) work correctly. Closes: LP #167943.
(bzr r4639)
Diffstat (limited to 'src/svg/svg-length.cpp')
-rw-r--r--src/svg/svg-length.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp
index f0b7f85f6..f90944667 100644
--- a/src/svg/svg-length.cpp
+++ b/src/svg/svg-length.cpp
@@ -350,7 +350,7 @@ static unsigned sp_svg_length_read_lff(gchar const *str, SVGLength::Unit *unit,
*unit = SVGLength::PC;
}
if (computed) {
- *computed = v * 12 * PX_PER_PT;
+ *computed = v * PX_PER_PC;
}
break;
case UVAL('m','m'):
@@ -377,6 +377,14 @@ static unsigned sp_svg_length_read_lff(gchar const *str, SVGLength::Unit *unit,
*computed = v * PX_PER_IN;
}
break;
+ case UVAL('f','t'):
+ if (unit) {
+ *unit = SVGLength::FOOT;
+ }
+ if (computed) {
+ *computed = v * PX_PER_FT;
+ }
+ break;
case UVAL('e','m'):
if (unit) {
*unit = SVGLength::EM;