diff options
| author | Tobrun <tobrun.van.nuland@gmail.com> | 2019-08-29 19:38:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-29 19:38:27 +0200 |
| commit | 520c59c11a632e54233d615fba0960c7f4144714 (patch) | |
| tree | 5178fb23f61db793fc1fb750d59edc776c711369 /src/mbgl/map/map.cpp | |
| parent | 3321bde94e20ed5ebc43c0051d93a72e9afc2515 (diff) | |
| parent | 544aabd0204235579e99fe4d9b8c2de16f70e897 (diff) | |
| download | qtlocation-mapboxgl-520c59c11a632e54233d615fba0960c7f4144714.tar.gz | |
Merge branch 'master' into tvn-number-format-expression
Diffstat (limited to 'src/mbgl/map/map.cpp')
| -rw-r--r-- | src/mbgl/map/map.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index c35f33305c..649e0e321e 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -124,7 +124,7 @@ bool Map::isPanning() const { #pragma mark - -CameraOptions Map::getCameraOptions(const EdgeInsets& padding) const { +CameraOptions Map::getCameraOptions(optional<EdgeInsets> padding) const { return impl->transform.getCameraOptions(padding); } |