From 9239c50a3a154ef6725d6ad36641279cf6f69752 Mon Sep 17 00:00:00 2001 From: Xisco Fauli Date: Wed, 5 Jul 2023 20:44:27 +0200 Subject: svgio: use frozen more Change-Id: I64c5d12321a10cc1f63d7892c83ff7bd3a232a26 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154072 Tested-by: Jenkins Reviewed-by: Xisco Fauli --- svgio/source/svgreader/svgtools.cxx | 309 ++++++++++++++++++------------------ 1 file changed, 155 insertions(+), 154 deletions(-) (limited to 'svgio') diff --git a/svgio/source/svgreader/svgtools.cxx b/svgio/source/svgreader/svgtools.cxx index 9539fcf618b9..f7bc5b951f97 100644 --- a/svgio/source/svgreader/svgtools.cxx +++ b/svgio/source/svgreader/svgtools.cxx @@ -26,10 +26,163 @@ #include #include #include -#include +#include +#include +#include namespace svgio::svgreader { + constexpr frozen::unordered_map aColorTokenMapperList + { + { u"aliceblue", Color(240, 248, 255) }, + { u"antiquewhite", Color(250, 235, 215) }, + { u"aqua", Color( 0, 255, 255) }, + { u"aquamarine", Color(127, 255, 212) }, + { u"azure", Color(240, 255, 255) }, + { u"beige", Color(245, 245, 220) }, + { u"bisque", Color(255, 228, 196) }, + { u"black", Color( 0, 0, 0) }, + { u"blanchedalmond", Color(255, 235, 205) }, + { u"blue", Color( 0, 0, 255) }, + { u"blueviolet", Color(138, 43, 226) }, + { u"brown", Color(165, 42, 42) }, + { u"burlywood", Color(222, 184, 135) }, + { u"cadetblue", Color( 95, 158, 160) }, + { u"chartreuse", Color(127, 255, 0) }, + { u"chocolate", Color(210, 105, 30) }, + { u"coral", Color(255, 127, 80) }, + { u"cornflowerblue", Color(100, 149, 237) }, + { u"cornsilk", Color(255, 248, 220) }, + { u"crimson", Color(220, 20, 60) }, + { u"cyan", Color( 0, 255, 255) }, + { u"darkblue", Color( 0, 0, 139) }, + { u"darkcyan", Color( 0, 139, 139) }, + { u"darkgoldenrod", Color(184, 134, 11) }, + { u"darkgray", Color(169, 169, 169) }, + { u"darkgreen", Color( 0, 100, 0) }, + { u"darkgrey", Color(169, 169, 169) }, + { u"darkkhaki", Color(189, 183, 107) }, + { u"darkmagenta", Color(139, 0, 139) }, + { u"darkolivegreen", Color( 85, 107, 47) }, + { u"darkorange", Color(255, 140, 0) }, + { u"darkorchid", Color(153, 50, 204) }, + { u"darkred", Color(139, 0, 0) }, + { u"darksalmon", Color(233, 150, 122) }, + { u"darkseagreen", Color(143, 188, 143) }, + { u"darkslateblue", Color( 72, 61, 139) }, + { u"darkslategray", Color( 47, 79, 79) }, + { u"darkslategrey", Color( 47, 79, 79) }, + { u"darkturquoise", Color( 0, 206, 209) }, + { u"darkviolet", Color(148, 0, 211) }, + { u"deeppink", Color(255, 20, 147) }, + { u"deepskyblue", Color( 0, 191, 255) }, + { u"dimgray", Color(105, 105, 105) }, + { u"dimgrey", Color(105, 105, 105) }, + { u"dodgerblue", Color( 30, 144, 255) }, + { u"firebrick", Color(178, 34, 34) }, + { u"floralwhite", Color(255, 250, 240) }, + { u"forestgreen", Color( 34, 139, 34) }, + { u"fuchsia", Color(255, 0, 255) }, + { u"gainsboro", Color(220, 220, 220) }, + { u"ghostwhite", Color(248, 248, 255) }, + { u"gold", Color(255, 215, 0) }, + { u"goldenrod", Color(218, 165, 32) }, + { u"gray", Color(128, 128, 128) }, + { u"grey", Color(128, 128, 128) }, + { u"green", Color(0, 128, 0) }, + { u"greenyellow", Color(173, 255, 47) }, + { u"honeydew", Color(240, 255, 240) }, + { u"hotpink", Color(255, 105, 180) }, + { u"indianred", Color(205, 92, 92) }, + { u"indigo", Color( 75, 0, 130) }, + { u"ivory", Color(255, 255, 240) }, + { u"khaki", Color(240, 230, 140) }, + { u"lavender", Color(230, 230, 250) }, + { u"lavenderblush", Color(255, 240, 245) }, + { u"lawngreen", Color(124, 252, 0) }, + { u"lemonchiffon", Color(255, 250, 205) }, + { u"lightblue", Color(173, 216, 230) }, + { u"lightcoral", Color(240, 128, 128) }, + { u"lightcyan", Color(224, 255, 255) }, + { u"lightgoldenrodyellow", Color(250, 250, 210) }, + { u"lightgray", Color(211, 211, 211) }, + { u"lightgreen", Color(144, 238, 144) }, + { u"lightgrey", Color(211, 211, 211) }, + { u"lightpink", Color(255, 182, 193) }, + { u"lightsalmon", Color(255, 160, 122) }, + { u"lightseagreen", Color( 32, 178, 170) }, + { u"lightskyblue", Color(135, 206, 250) }, + { u"lightslategray", Color(119, 136, 153) }, + { u"lightslategrey", Color(119, 136, 153) }, + { u"lightsteelblue", Color(176, 196, 222) }, + { u"lightyellow", Color(255, 255, 224) }, + { u"lime", Color( 0, 255, 0) }, + { u"limegreen", Color( 50, 205, 50) }, + { u"linen", Color(250, 240, 230) }, + { u"magenta", Color(255, 0, 255) }, + { u"maroon", Color(128, 0, 0) }, + { u"mediumaquamarine", Color(102, 205, 170) }, + { u"mediumblue", Color( 0, 0, 205) }, + { u"mediumorchid", Color(186, 85, 211) }, + { u"mediumpurple", Color(147, 112, 219) }, + { u"mediumseagreen", Color( 60, 179, 113) }, + { u"mediumslateblue", Color(123, 104, 238) }, + { u"mediumspringgreen", Color( 0, 250, 154) }, + { u"mediumturquoise", Color( 72, 209, 204) }, + { u"mediumvioletred", Color(199, 21, 133) }, + { u"midnightblue", Color( 25, 25, 112) }, + { u"mintcream", Color(245, 255, 250) }, + { u"mistyrose", Color(255, 228, 225) }, + { u"moccasin", Color(255, 228, 181) }, + { u"navajowhite", Color(255, 222, 173) }, + { u"navy", Color( 0, 0, 128) }, + { u"oldlace", Color(253, 245, 230) }, + { u"olive", Color(128, 128, 0) }, + { u"olivedrab", Color(107, 142, 35) }, + { u"orange", Color(255, 165, 0) }, + { u"orangered", Color(255, 69, 0) }, + { u"orchid", Color(218, 112, 214) }, + { u"palegoldenrod", Color(238, 232, 170) }, + { u"palegreen", Color(152, 251, 152) }, + { u"paleturquoise", Color(175, 238, 238) }, + { u"palevioletred", Color(219, 112, 147) }, + { u"papayawhip", Color(255, 239, 213) }, + { u"peachpuff", Color(255, 218, 185) }, + { u"peru", Color(205, 133, 63) }, + { u"pink", Color(255, 192, 203) }, + { u"plum", Color(221, 160, 221) }, + { u"powderblue", Color(176, 224, 230) }, + { u"purple", Color(128, 0, 128) }, + { u"red", Color(255, 0, 0) }, + { u"rosybrown", Color(188, 143, 143) }, + { u"royalblue", Color( 65, 105, 225) }, + { u"saddlebrown", Color(139, 69, 19) }, + { u"salmon", Color(250, 128, 114) }, + { u"sandybrown", Color(244, 164, 96) }, + { u"seagreen", Color( 46, 139, 87) }, + { u"seashell", Color(255, 245, 238) }, + { u"sienna", Color(160, 82, 45) }, + { u"silver", Color(192, 192, 192) }, + { u"skyblue", Color(135, 206, 235) }, + { u"slateblue", Color(106, 90, 205) }, + { u"slategray", Color(112, 128, 144) }, + { u"slategrey", Color(112, 128, 144) }, + { u"snow", Color(255, 250, 250) }, + { u"springgreen", Color( 0, 255, 127) }, + { u"steelblue", Color( 70, 130, 180) }, + { u"tan", Color(210, 180, 140) }, + { u"teal", Color( 0, 128, 128) }, + { u"thistle", Color(216, 191, 216) }, + { u"tomato", Color(255, 99, 71) }, + { u"turquoise", Color( 64, 224, 208) }, + { u"violet", Color(238, 130, 238) }, + { u"wheat", Color(245, 222, 179) }, + { u"white", Color(255, 255, 255) }, + { u"whitesmoke", Color(245, 245, 245) }, + { u"yellow", Color(255, 255, 0) }, + { u"yellowgreen", Color(154, 205, 50) } + }; + basegfx::B2DHomMatrix SvgAspectRatio::createLinearMapping(const basegfx::B2DRange& rTarget, const basegfx::B2DRange& rSource) { basegfx::B2DHomMatrix aRetval; @@ -489,159 +642,7 @@ namespace svgio::svgreader bool match_colorKeyword(basegfx::BColor& rColor, const OUString& rName) { - typedef std::unordered_map< OUString, Color > ColorTokenMapper; - typedef std::pair< OUString, Color > ColorTokenValueType; - static const ColorTokenMapper aColorTokenMapperList { - { ColorTokenValueType(OUString("aliceblue"), Color(240, 248, 255)) }, - { ColorTokenValueType(OUString("antiquewhite"), Color(250, 235, 215) ) }, - { ColorTokenValueType(OUString("aqua"), Color( 0, 255, 255) ) }, - { ColorTokenValueType(OUString("aquamarine"), Color(127, 255, 212) ) }, - { ColorTokenValueType(OUString("azure"), Color(240, 255, 255) ) }, - { ColorTokenValueType(OUString("beige"), Color(245, 245, 220) ) }, - { ColorTokenValueType(OUString("bisque"), Color(255, 228, 196) ) }, - { ColorTokenValueType(OUString("black"), Color( 0, 0, 0) ) }, - { ColorTokenValueType(OUString("blanchedalmond"), Color(255, 235, 205) ) }, - { ColorTokenValueType(OUString("blue"), Color( 0, 0, 255) ) }, - { ColorTokenValueType(OUString("blueviolet"), Color(138, 43, 226) ) }, - { ColorTokenValueType(OUString("brown"), Color(165, 42, 42) ) }, - { ColorTokenValueType(OUString("burlywood"), Color(222, 184, 135) ) }, - { ColorTokenValueType(OUString("cadetblue"), Color( 95, 158, 160) ) }, - { ColorTokenValueType(OUString("chartreuse"), Color(127, 255, 0) ) }, - { ColorTokenValueType(OUString("chocolate"), Color(210, 105, 30) ) }, - { ColorTokenValueType(OUString("coral"), Color(255, 127, 80) ) }, - { ColorTokenValueType(OUString("cornflowerblue"), Color(100, 149, 237) ) }, - { ColorTokenValueType(OUString("cornsilk"), Color(255, 248, 220) ) }, - { ColorTokenValueType(OUString("crimson"), Color(220, 20, 60) ) }, - { ColorTokenValueType(OUString("cyan"), Color( 0, 255, 255) ) }, - { ColorTokenValueType(OUString("darkblue"), Color( 0, 0, 139) ) }, - { ColorTokenValueType(OUString("darkcyan"), Color( 0, 139, 139) ) }, - { ColorTokenValueType(OUString("darkgoldenrod"), Color(184, 134, 11) ) }, - { ColorTokenValueType(OUString("darkgray"), Color(169, 169, 169) ) }, - { ColorTokenValueType(OUString("darkgreen"), Color( 0, 100, 0) ) }, - { ColorTokenValueType(OUString("darkgrey"), Color(169, 169, 169) ) }, - { ColorTokenValueType(OUString("darkkhaki"), Color(189, 183, 107) ) }, - { ColorTokenValueType(OUString("darkmagenta"), Color(139, 0, 139) ) }, - { ColorTokenValueType(OUString("darkolivegreen"), Color( 85, 107, 47) ) }, - { ColorTokenValueType(OUString("darkorange"), Color(255, 140, 0) ) }, - { ColorTokenValueType(OUString("darkorchid"), Color(153, 50, 204) ) }, - { ColorTokenValueType(OUString("darkred"), Color(139, 0, 0) ) }, - { ColorTokenValueType(OUString("darksalmon"), Color(233, 150, 122) ) }, - { ColorTokenValueType(OUString("darkseagreen"), Color(143, 188, 143) ) }, - { ColorTokenValueType(OUString("darkslateblue"), Color( 72, 61, 139) ) }, - { ColorTokenValueType(OUString("darkslategray"), Color( 47, 79, 79) ) }, - { ColorTokenValueType(OUString("darkslategrey"), Color( 47, 79, 79) ) }, - { ColorTokenValueType(OUString("darkturquoise"), Color( 0, 206, 209) ) }, - { ColorTokenValueType(OUString("darkviolet"), Color(148, 0, 211) ) }, - { ColorTokenValueType(OUString("deeppink"), Color(255, 20, 147) ) }, - { ColorTokenValueType(OUString("deepskyblue"), Color( 0, 191, 255) ) }, - { ColorTokenValueType(OUString("dimgray"), Color(105, 105, 105) ) }, - { ColorTokenValueType(OUString("dimgrey"), Color(105, 105, 105) ) }, - { ColorTokenValueType(OUString("dodgerblue"), Color( 30, 144, 255) ) }, - { ColorTokenValueType(OUString("firebrick"), Color(178, 34, 34) ) }, - { ColorTokenValueType(OUString("floralwhite"), Color(255, 250, 240) ) }, - { ColorTokenValueType(OUString("forestgreen"), Color( 34, 139, 34) ) }, - { ColorTokenValueType(OUString("fuchsia"), Color(255, 0, 255) ) }, - { ColorTokenValueType(OUString("gainsboro"), Color(220, 220, 220) ) }, - { ColorTokenValueType(OUString("ghostwhite"), Color(248, 248, 255) ) }, - { ColorTokenValueType(OUString("gold"), Color(255, 215, 0) ) }, - { ColorTokenValueType(OUString("goldenrod"), Color(218, 165, 32) ) }, - { ColorTokenValueType(OUString("gray"), Color(128, 128, 128) ) }, - { ColorTokenValueType(OUString("grey"), Color(128, 128, 128) ) }, - { ColorTokenValueType(OUString("green"), Color(0, 128, 0) ) }, - { ColorTokenValueType(OUString("greenyellow"), Color(173, 255, 47) ) }, - { ColorTokenValueType(OUString("honeydew"), Color(240, 255, 240) ) }, - { ColorTokenValueType(OUString("hotpink"), Color(255, 105, 180) ) }, - { ColorTokenValueType(OUString("indianred"), Color(205, 92, 92) ) }, - { ColorTokenValueType(OUString("indigo"), Color( 75, 0, 130) ) }, - { ColorTokenValueType(OUString("ivory"), Color(255, 255, 240) ) }, - { ColorTokenValueType(OUString("khaki"), Color(240, 230, 140) ) }, - { ColorTokenValueType(OUString("lavender"), Color(230, 230, 250) ) }, - { ColorTokenValueType(OUString("lavenderblush"), Color(255, 240, 245) ) }, - { ColorTokenValueType(OUString("lawngreen"), Color(124, 252, 0) ) }, - { ColorTokenValueType(OUString("lemonchiffon"), Color(255, 250, 205) ) }, - { ColorTokenValueType(OUString("lightblue"), Color(173, 216, 230) ) }, - { ColorTokenValueType(OUString("lightcoral"), Color(240, 128, 128) ) }, - { ColorTokenValueType(OUString("lightcyan"), Color(224, 255, 255) ) }, - { ColorTokenValueType(OUString("lightgoldenrodyellow"), Color(250, 250, 210) ) }, - { ColorTokenValueType(OUString("lightgray"), Color(211, 211, 211) ) }, - { ColorTokenValueType(OUString("lightgreen"), Color(144, 238, 144) ) }, - { ColorTokenValueType(OUString("lightgrey"), Color(211, 211, 211) ) }, - { ColorTokenValueType(OUString("lightpink"), Color(255, 182, 193) ) }, - { ColorTokenValueType(OUString("lightsalmon"), Color(255, 160, 122) ) }, - { ColorTokenValueType(OUString("lightseagreen"), Color( 32, 178, 170) ) }, - { ColorTokenValueType(OUString("lightskyblue"), Color(135, 206, 250) ) }, - { ColorTokenValueType(OUString("lightslategray"), Color(119, 136, 153) ) }, - { ColorTokenValueType(OUString("lightslategrey"), Color(119, 136, 153) ) }, - { ColorTokenValueType(OUString("lightsteelblue"), Color(176, 196, 222) ) }, - { ColorTokenValueType(OUString("lightyellow"), Color(255, 255, 224) ) }, - { ColorTokenValueType(OUString("lime"), Color( 0, 255, 0) ) }, - { ColorTokenValueType(OUString("limegreen"), Color( 50, 205, 50) ) }, - { ColorTokenValueType(OUString("linen"), Color(250, 240, 230) ) }, - { ColorTokenValueType(OUString("magenta"), Color(255, 0, 255) ) }, - { ColorTokenValueType(OUString("maroon"), Color(128, 0, 0) ) }, - { ColorTokenValueType(OUString("mediumaquamarine"), Color(102, 205, 170) ) }, - { ColorTokenValueType(OUString("mediumblue"), Color( 0, 0, 205) ) }, - { ColorTokenValueType(OUString("mediumorchid"), Color(186, 85, 211) ) }, - { ColorTokenValueType(OUString("mediumpurple"), Color(147, 112, 219) ) }, - { ColorTokenValueType(OUString("mediumseagreen"), Color( 60, 179, 113) ) }, - { ColorTokenValueType(OUString("mediumslateblue"), Color(123, 104, 238) ) }, - { ColorTokenValueType(OUString("mediumspringgreen"), Color( 0, 250, 154) ) }, - { ColorTokenValueType(OUString("mediumturquoise"), Color( 72, 209, 204) ) }, - { ColorTokenValueType(OUString("mediumvioletred"), Color(199, 21, 133) ) }, - { ColorTokenValueType(OUString("midnightblue"), Color( 25, 25, 112) ) }, - { ColorTokenValueType(OUString("mintcream"), Color(245, 255, 250) ) }, - { ColorTokenValueType(OUString("mistyrose"), Color(255, 228, 225) ) }, - { ColorTokenValueType(OUString("moccasin"), Color(255, 228, 181) ) }, - { ColorTokenValueType(OUString("navajowhite"), Color(255, 222, 173) ) }, - { ColorTokenValueType(OUString("navy"), Color( 0, 0, 128) ) }, - { ColorTokenValueType(OUString("oldlace"), Color(253, 245, 230) ) }, - { ColorTokenValueType(OUString("olive"), Color(128, 128, 0) ) }, - { ColorTokenValueType(OUString("olivedrab"), Color(107, 142, 35) ) }, - { ColorTokenValueType(OUString("orange"), Color(255, 165, 0) ) }, - { ColorTokenValueType(OUString("orangered"), Color(255, 69, 0) ) }, - { ColorTokenValueType(OUString("orchid"), Color(218, 112, 214) ) }, - { ColorTokenValueType(OUString("palegoldenrod"), Color(238, 232, 170) ) }, - { ColorTokenValueType(OUString("palegreen"), Color(152, 251, 152) ) }, - { ColorTokenValueType(OUString("paleturquoise"), Color(175, 238, 238) ) }, - { ColorTokenValueType(OUString("palevioletred"), Color(219, 112, 147) ) }, - { ColorTokenValueType(OUString("papayawhip"), Color(255, 239, 213) ) }, - { ColorTokenValueType(OUString("peachpuff"), Color(255, 218, 185) ) }, - { ColorTokenValueType(OUString("peru"), Color(205, 133, 63) ) }, - { ColorTokenValueType(OUString("pink"), Color(255, 192, 203) ) }, - { ColorTokenValueType(OUString("plum"), Color(221, 160, 221) ) }, - { ColorTokenValueType(OUString("powderblue"), Color(176, 224, 230) ) }, - { ColorTokenValueType(OUString("purple"), Color(128, 0, 128) ) }, - { ColorTokenValueType(OUString("red"), Color(255, 0, 0) ) }, - { ColorTokenValueType(OUString("rosybrown"), Color(188, 143, 143) ) }, - { ColorTokenValueType(OUString("royalblue"), Color( 65, 105, 225) ) }, - { ColorTokenValueType(OUString("saddlebrown"), Color(139, 69, 19) ) }, - { ColorTokenValueType(OUString("salmon"), Color(250, 128, 114) ) }, - { ColorTokenValueType(OUString("sandybrown"), Color(244, 164, 96) ) }, - { ColorTokenValueType(OUString("seagreen"), Color( 46, 139, 87) ) }, - { ColorTokenValueType(OUString("seashell"), Color(255, 245, 238) ) }, - { ColorTokenValueType(OUString("sienna"), Color(160, 82, 45) ) }, - { ColorTokenValueType(OUString("silver"), Color(192, 192, 192) ) }, - { ColorTokenValueType(OUString("skyblue"), Color(135, 206, 235) ) }, - { ColorTokenValueType(OUString("slateblue"), Color(106, 90, 205) ) }, - { ColorTokenValueType(OUString("slategray"), Color(112, 128, 144) ) }, - { ColorTokenValueType(OUString("slategrey"), Color(112, 128, 144) ) }, - { ColorTokenValueType(OUString("snow"), Color(255, 250, 250) ) }, - { ColorTokenValueType(OUString("springgreen"), Color( 0, 255, 127) ) }, - { ColorTokenValueType(OUString("steelblue"), Color( 70, 130, 180) ) }, - { ColorTokenValueType(OUString("tan"), Color(210, 180, 140) ) }, - { ColorTokenValueType(OUString("teal"), Color( 0, 128, 128) ) }, - { ColorTokenValueType(OUString("thistle"), Color(216, 191, 216) ) }, - { ColorTokenValueType(OUString("tomato"), Color(255, 99, 71) ) }, - { ColorTokenValueType(OUString("turquoise"), Color( 64, 224, 208) ) }, - { ColorTokenValueType(OUString("violet"), Color(238, 130, 238) ) }, - { ColorTokenValueType(OUString("wheat"), Color(245, 222, 179) ) }, - { ColorTokenValueType(OUString("white"), Color(255, 255, 255) ) }, - { ColorTokenValueType(OUString("whitesmoke"), Color(245, 245, 245) ) }, - { ColorTokenValueType(OUString("yellow"), Color(255, 255, 0) ) }, - { ColorTokenValueType(OUString("yellowgreen"), Color(154, 205, 50) ) }, - }; - - ColorTokenMapper::const_iterator aResult(aColorTokenMapperList.find(rName.toAsciiLowerCase().trim())); + auto const aResult = aColorTokenMapperList.find(rName.toAsciiLowerCase().trim()); if(aResult == aColorTokenMapperList.end()) { -- cgit