summaryrefslogtreecommitdiffstats
path: root/src/util/units.cpp
diff options
context:
space:
mode:
authorTim Rawlinson <tim.r+gitlab@wlinson.co.uk>2019-02-15 11:52:16 +0000
committerTim Rawlinson <tim.r+gitlab@wlinson.co.uk>2019-02-15 11:52:16 +0000
commit223cd7ba60196d159d92ba6a0ae1da0a8f706658 (patch)
tree82e45e90cb44f34f15d0071d8c07e21c124483f1 /src/util/units.cpp
parentMove all files except inkscape_main and inkview_main into shared library. (diff)
downloadinkscape-223cd7ba60196d159d92ba6a0ae1da0a8f706658.tar.gz
inkscape-223cd7ba60196d159d92ba6a0ae1da0a8f706658.zip
Fix unmatched svg_length_lookup[] array and SVGLength::Unit
Diffstat (limited to 'src/util/units.cpp')
-rw-r--r--src/util/units.cpp6
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