tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make MapContext use StillImageCallback definition from Map

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2015-08-02 22:34:29 +03:00
parent 92d78eae38
commit 0eb7effad7
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mbgl/map/map_context.cpp
View File

@@ -280,7 +280,7 @@ void MapContext::update() {
updated = static_cast<UpdateType>(Update::Nothing);
}
void MapContext::renderStill(const TransformState& state, const FrameData& frame, StillImageCallback fn) {
void MapContext::renderStill(const TransformState& state, const FrameData& frame, Map::StillImageCallback fn) {
if (!fn) {
Log::Error(Event::General, "StillImageCallback not set");
return;

7
src/mbgl/map/map_context.hpp
View File

@@ -4,6 +4,7 @@
#include <mbgl/map/tile_id.hpp>
#include <mbgl/map/update.hpp>
#include <mbgl/map/transform_state.hpp>
#include <mbgl/map/map.hpp>
#include <mbgl/style/style.hpp>
#include <mbgl/util/gl_object_store.hpp>
#include <mbgl/util/ptr.hpp>
@@ -44,10 +45,8 @@ public:
void pause();
using StillImageCallback = std::function<void(std::exception_ptr, std::unique_ptr<const StillImage>)>;
void triggerUpdate(const TransformState&, Update = Update::Nothing);
void renderStill(const TransformState&, const FrameData&, StillImageCallback callback);
void renderStill(const TransformState&, const FrameData&, Map::StillImageCallback callback);
RenderResult renderSync(const TransformState&, const FrameData&);
void setStyleURL(const std::string&);
@@ -95,7 +94,7 @@ private:
Request* styleRequest = nullptr;
StillImageCallback callback;
Map::StillImageCallback callback;
size_t sourceCacheSize;
TransformState transformState;
FrameData frameData;