summaryrefslogtreecommitdiffstats
path: root/src/svg
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2013-10-13 19:40:31 +0000
committerJabiertxof <jtx@jtx.marker.es>2013-10-13 19:40:31 +0000
commit34789891fcdbd099bd390ce3d0465dee24a788db (patch)
tree1b16d78374f9d56c0f03a6b20c9e2e6048f4fb5e /src/svg
parentupdate to trunk (diff)
parentUI message generalisation (diff)
downloadinkscape-34789891fcdbd099bd390ce3d0465dee24a788db.tar.gz
inkscape-34789891fcdbd099bd390ce3d0465dee24a788db.zip
Update to trunk
(bzr r12588.1.12)
Diffstat (limited to 'src/svg')
-rw-r--r--src/svg/svg-length.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp
index 8d26a95d2..6f1a88a58 100644
--- a/src/svg/svg-length.cpp
+++ b/src/svg/svg-length.cpp
@@ -541,6 +541,8 @@ std::string sp_svg_length_write_with_units(SVGLength const &length)
Inkscape::SVGOStringStream os;
if (length.unit == SVGLength::PERCENT) {
os << 100*length.value << sp_svg_length_get_css_units(length.unit);
+ } else if (length.unit == SVGLength::FOOT) {
+ os << 12*length.value << sp_svg_length_get_css_units(SVGLength::INCH);
} else {
os << length.value << sp_svg_length_get_css_units(length.unit);
}