diff options
| author | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-03-14 17:47:40 +0100 |
|---|---|---|
| committer | Paolo Angelelli <paolo.angelelli@qt.io> | 2017-03-22 11:13:41 +0000 |
| commit | 93953ab98639d6b3278769cace5f92122d3ed327 (patch) | |
| tree | b5282996286bf33cc74b9e104eb2435ffdfe51c9 /src/location/maps | |
| parent | ec1033a1cc24305025f9397ff29b6562a3187eb8 (diff) | |
Lower bound minimum/maximumZoomLevelAt256
Without this patch, using tiles of size 128 may cause these methods
to return negative values
Change-Id: I6476083350fd552756d1388fa9bc8fa36d8c4ee3
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Bruno de Oliveira Abinader <brunoabinader@gmail.com>
Diffstat (limited to 'src/location/maps')
| -rw-r--r-- | src/location/maps/qgeocameracapabilities.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/location/maps/qgeocameracapabilities.cpp b/src/location/maps/qgeocameracapabilities.cpp index 6426b058..f9eecbf8 100644 --- a/src/location/maps/qgeocameracapabilities.cpp +++ b/src/location/maps/qgeocameracapabilities.cpp @@ -248,7 +248,7 @@ double QGeoCameraCapabilities::minimumZoomLevelAt256() const { if (d->tileSize_ == 256) return d->minZoom_; - return zoomLevelTo256(d->minZoom_, d->tileSize_); + return qMax<double>(0, zoomLevelTo256(d->minZoom_, d->tileSize_)); } /*! @@ -278,7 +278,7 @@ double QGeoCameraCapabilities::maximumZoomLevelAt256() const { if (d->tileSize_ == 256) return d->maxZoom_; - return zoomLevelTo256(d->maxZoom_, d->tileSize_); + return qMax<double>(0, zoomLevelTo256(d->maxZoom_, d->tileSize_)); } /*! |