diff options
| author | Martin Owens <doctormo@gmail.com> | 2019-03-03 01:46:12 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2019-03-03 01:46:12 +0000 |
| commit | a81187537a00bfd368fdde234d925b8eba2dcf41 (patch) | |
| tree | 5ece8e6fc11f495e37a38c2cbe6d17231df8f134 | |
| parent | refactor PanelDialog<Behavior::FloatingBehavior> (diff) | |
| parent | Fix unmatched svg_length_lookup[] array and SVGLength::Unit (diff) | |
| download | inkscape-a81187537a00bfd368fdde234d925b8eba2dcf41.tar.gz inkscape-a81187537a00bfd368fdde234d925b8eba2dcf41.zip | |
Merge branch 'tim_rawlinson/inkscape-patch-4'
| -rw-r--r-- | src/util/units.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/util/units.cpp b/src/util/units.cpp index 0a1fdbf31..d24ec3c25 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -45,8 +45,6 @@ enum UnitCode { UNIT_CODE_MM = MAKE_UNIT_CODE('m','m'), 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) @@ -64,7 +62,7 @@ inline unsigned make_unit_code(char const *str) { } - +// This must match SVGLength::Unit unsigned const svg_length_lookup[] = { 0, UNIT_CODE_PX, @@ -73,8 +71,6 @@ unsigned const svg_length_lookup[] = { UNIT_CODE_MM, UNIT_CODE_CM, UNIT_CODE_IN, - UNIT_CODE_FT, - UNIT_CODE_MT, UNIT_CODE_EM, UNIT_CODE_EX, UNIT_CODE_PERCENT |