diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2014-07-25 11:45:56 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-07-25 11:45:56 -0700 |
commit | 600e1d8a9e1a388f010b8fdf1f296eadfd2be67e (patch) | |
tree | a95d3135081ecab6cdeb8699e0814f97c9643593 /include/mbgl/style | |
parent | bf1924c4c949225d629a6095e1cc5f4a34157f91 (diff) | |
download | qtlocation-mapboxgl-600e1d8a9e1a388f010b8fdf1f296eadfd2be67e.tar.gz |
line-join defaults to miter (fixes #384)
Diffstat (limited to 'include/mbgl/style')
-rw-r--r-- | include/mbgl/style/types.hpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp index ca2061fa91..f8e99418da 100644 --- a/include/mbgl/style/types.hpp +++ b/include/mbgl/style/types.hpp @@ -42,19 +42,17 @@ enum class WindingType : uint8_t { }; enum class CapType : uint8_t { - None, Round, Butt, Square, - Default = None + Default = Butt }; enum class JoinType : uint8_t { - None, Miter, Bevel, Round, - Default = None + Default = Miter }; enum class TextPathType : uint8_t { @@ -100,14 +98,14 @@ inline CapType parseCapType(const std::string &cap) { if (cap == "round") return CapType::Round; if (cap == "butt") return CapType::Butt; if (cap == "square") return CapType::Square; - return CapType::None; + return CapType::Default; } inline JoinType parseJoinType(const std::string &join) { if (join == "miter") return JoinType::Miter; if (join == "bevel") return JoinType::Bevel; if (join == "round") return JoinType::Round; - return JoinType::None; + return JoinType::Default; } inline TextPathType parseTextPathType(const std::string &path) { |