diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-21 14:52:19 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-24 15:52:28 -0700 |
| commit | 5dd98df50ba1210b1eef0d8d6655713a725f2995 (patch) | |
| tree | b289bb3cbad5d1c3076816f4891a057d6089fc93 /cmake | |
| parent | 6f708ac5458fe332e25ca398431928b7ff5ba404 (diff) | |
| download | qtlocation-mapboxgl-5dd98df50ba1210b1eef0d8d6655713a725f2995.tar.gz | |
[all] Rationalize style::Image
A style has a collection of images, just as it has collections of sources and layers.
* Name things appropriately
* Use std::unique_ptr
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/core-files.cmake | 4 | ||||
| -rw-r--r-- | cmake/test-files.cmake | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake index e8c168df41..a0c46c7cd4 100644 --- a/cmake/core-files.cmake +++ b/cmake/core-files.cmake @@ -217,13 +217,11 @@ set(MBGL_CORE_FILES src/mbgl/shaders/symbol_sdf.hpp # sprite - include/mbgl/sprite/sprite_image.hpp src/mbgl/sprite/sprite_atlas.cpp src/mbgl/sprite/sprite_atlas.hpp src/mbgl/sprite/sprite_atlas_observer.hpp src/mbgl/sprite/sprite_atlas_worker.cpp src/mbgl/sprite/sprite_atlas_worker.hpp - src/mbgl/sprite/sprite_image.cpp src/mbgl/sprite/sprite_parser.cpp src/mbgl/sprite/sprite_parser.hpp @@ -247,6 +245,7 @@ set(MBGL_CORE_FILES include/mbgl/style/data_driven_property_value.hpp include/mbgl/style/filter.hpp include/mbgl/style/filter_evaluator.hpp + include/mbgl/style/image.hpp include/mbgl/style/layer.hpp include/mbgl/style/property_value.hpp include/mbgl/style/query.hpp @@ -264,6 +263,7 @@ set(MBGL_CORE_FILES src/mbgl/style/data_driven_property_evaluator.hpp src/mbgl/style/group_by_layout.cpp src/mbgl/style/group_by_layout.hpp + src/mbgl/style/image.cpp src/mbgl/style/layer.cpp src/mbgl/style/layer_impl.cpp src/mbgl/style/layer_impl.hpp diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index dab5b48745..02df6c4d67 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -43,7 +43,6 @@ set(MBGL_TEST_FILES # sprite test/sprite/sprite_atlas.test.cpp - test/sprite/sprite_image.test.cpp test/sprite/sprite_parser.test.cpp # src/mbgl/test @@ -95,6 +94,7 @@ set(MBGL_TEST_FILES test/style/paint_property.test.cpp test/style/source.test.cpp test/style/style.test.cpp + test/style/style_image.test.cpp test/style/style_layer.test.cpp test/style/style_parser.test.cpp test/style/tile_source.test.cpp |