diff options
| author | Minh Nguyễn <mxn@1ec5.org> | 2016-12-20 12:41:40 -0800 |
|---|---|---|
| committer | Minh Nguyễn <mxn@1ec5.org> | 2016-12-20 12:41:40 -0800 |
| commit | a6b1773a44d4ef086eb30967cb041cb64312650a (patch) | |
| tree | ec293e38c9ec3ef1f32195f0d5071f73b88497ed /include/mbgl | |
| parent | dad57df38ef86363da9bff2e62f3fddc5688f0cf (diff) | |
| parent | e2fde9cc4eff3de5ab2f513d0c24ad5471d147e6 (diff) | |
| download | qtlocation-mapboxgl-a6b1773a44d4ef086eb30967cb041cb64312650a.tar.gz | |
Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.0-beta.5-master
Also reran make style-code and manually discarded anything related to fill extrusion layers.
Diffstat (limited to 'include/mbgl')
| -rw-r--r-- | include/mbgl/map/map.hpp | 1 | ||||
| -rw-r--r-- | include/mbgl/style/layers/custom_layer.hpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index a6e77218b3..c80420371d 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -171,6 +171,7 @@ public: // Add image, bound to the style void addImage(const std::string&, std::unique_ptr<const SpriteImage>); void removeImage(const std::string&); + const SpriteImage* getImage(const std::string&); // Defaults std::string getStyleName() const; diff --git a/include/mbgl/style/layers/custom_layer.hpp b/include/mbgl/style/layers/custom_layer.hpp index 87bce06f41..1b62f82a25 100644 --- a/include/mbgl/style/layers/custom_layer.hpp +++ b/include/mbgl/style/layers/custom_layer.hpp @@ -7,8 +7,8 @@ namespace style { /** * Initialize any GL state needed by the custom layer. This method is called once, from the - * rendering thread, at a point when the GL context is active but before rendering for the - * first time. + * main thread, at a point when the GL context is active but before rendering for the first + * time. * * Resources that are acquired in this method must be released in the UninitializeFunction. */ @@ -40,7 +40,7 @@ using CustomLayerRenderFunction = void (*)(void* context, const CustomLayerRende /** * Destroy any GL state needed by the custom layer, and deallocate context, if necessary. This - * method is called once, from the rendering thread, at a point when the GL context is active. + * method is called once, from the main thread, at a point when the GL context is active. * * Note that it may be called even when the InitializeFunction has not been called. */ |