diff options
| author | Young Hahn <young@mapbox.com> | 2016-06-15 11:38:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 11:38:22 -0400 |
| commit | 24b66bc8cdd40a52e08d198c063daa3e1f6be92a (patch) | |
| tree | 6d98a5e1216a83f7d6d4c78422c8306d4a4cb157 /test/api | |
| parent | fe64238b4cd5a7da403a4f29a62b14234ecba569 (diff) | |
| download | qtlocation-mapboxgl-24b66bc8cdd40a52e08d198c063daa3e1f6be92a.tar.gz | |
Color class (#5361)
* Color class
* Switch to list initialization
Diffstat (limited to 'test/api')
| -rw-r--r-- | test/api/annotations.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp index fefc1c79b1..abe3862f4e 100644 --- a/test/api/annotations.cpp +++ b/test/api/annotations.cpp @@ -8,6 +8,7 @@ #include <mbgl/platform/default/headless_view.hpp> #include <mbgl/util/io.hpp> #include <mbgl/util/run_loop.hpp> +#include <mbgl/util/color.hpp> using namespace mbgl; @@ -48,7 +49,7 @@ TEST(Annotations, LineAnnotation) { LineString<double> line = {{ { 0, 0 }, { 45, 45 }, { 30, 0 } }}; LineAnnotation annotation { line }; - annotation.color = {{ 255, 0, 0, 1 }}; + annotation.color = { 255, 0, 0, 1 }; annotation.width = 5; test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); @@ -61,7 +62,7 @@ TEST(Annotations, FillAnnotation) { Polygon<double> polygon = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }}; FillAnnotation annotation { polygon }; - annotation.color = {{ 255, 0, 0, 1 }}; + annotation.color = { 255, 0, 0, 1 }; test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); test.map.addAnnotation(annotation); @@ -99,7 +100,7 @@ TEST(Annotations, NonImmediateAdd) { Polygon<double> polygon = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }}; FillAnnotation annotation { polygon }; - annotation.color = {{ 255, 0, 0, 1 }}; + annotation.color = { 255, 0, 0, 1 }; test.map.addAnnotation(annotation); test.checkRendering("non_immediate_add"); @@ -153,7 +154,7 @@ TEST(Annotations, RemoveShape) { LineString<double> line = {{ { 0, 0 }, { 45, 45 } }}; LineAnnotation annotation { line }; - annotation.color = {{ 255, 0, 0, 1 }}; + annotation.color = { 255, 0, 0, 1 }; annotation.width = 5; test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); |