diff options
| author | Tavmjong Bah <tavmjong@free.fr> | 2014-11-25 14:20:24 +0000 |
|---|---|---|
| committer | tavmjong-free <tavmjong@free.fr> | 2014-11-25 14:20:24 +0000 |
| commit | 9827a6723d62935725b67b1bf55eea08bbbab527 (patch) | |
| tree | a3f91e846fc26a5c9e1525405a710ea1422ca7e7 /src/util/units.cpp | |
| parent | Allow marker orientation to have units ('deg', 'rad', 'grad', 'turn'). (diff) | |
| download | inkscape-9827a6723d62935725b67b1bf55eea08bbbab527.tar.gz inkscape-9827a6723d62935725b67b1bf55eea08bbbab527.zip | |
Move 'm' handling code from document.cpp to svg-length.cpp and units.cpp to match handling of 'ft'.
(bzr r13758)
Diffstat (limited to 'src/util/units.cpp')
| -rw-r--r-- | src/util/units.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/util/units.cpp b/src/util/units.cpp index 8ad3560dd..2c72ec3ae 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -16,6 +16,7 @@ #include <cmath> #include <cerrno> #include <iomanip> +#include <iostream> #include <glib.h> #include <glibmm/regex.h> #include <glibmm/fileutils.h> @@ -46,6 +47,7 @@ enum UnitCode { UNIT_CODE_CM = MAKE_UNIT_CODE('c','m'), UNIT_CODE_IN = MAKE_UNIT_CODE('i','n'), UNIT_CODE_FT = MAKE_UNIT_CODE('f','t'), + UNIT_CODE_MT = MAKE_UNIT_CODE('m',' '), UNIT_CODE_EM = MAKE_UNIT_CODE('e','m'), UNIT_CODE_EX = MAKE_UNIT_CODE('e','x'), UNIT_CODE_PERCENT = MAKE_UNIT_CODE('%',0) @@ -73,6 +75,7 @@ unsigned const svg_length_lookup[] = { UNIT_CODE_CM, UNIT_CODE_IN, UNIT_CODE_FT, + UNIT_CODE_MT, UNIT_CODE_EM, UNIT_CODE_EX, UNIT_CODE_PERCENT |