From c4b1431e9247cf75e419c2c21cd91fa17a5a1f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@oslandia.com>
Date: Tue, 18 Jun 2019 15:43:05 +0200
Subject: [PATCH] Set extent buffer in configureMapSettings

---
 src/server/services/wms/qgswmsrenderer.cpp | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
index 770e05e81c7..248ea718454 100644
--- a/src/server/services/wms/qgswmsrenderer.cpp
+++ b/src/server/services/wms/qgswmsrenderer.cpp
@@ -751,18 +751,13 @@ namespace QgsWms
     QgsMapSettings mapSettings;
     configureLayers( layers, &mapSettings );
 
-    const QSize mapSize = mContext.mapSize();
-
     // create the output image and the painter
     std::unique_ptr<QPainter> painter;
-    std::unique_ptr<QImage> image( createImage( mapSize ) );
+    std::unique_ptr<QImage> image( createImage( mContext.mapSize() ) );
 
     // configure map settings (background, DPI, ...)
     configureMapSettings( image.get(), mapSettings );
 
-    // set the extent buffer in the map settings
-    mapSettings.setExtentBuffer( mContext.mapTileBuffer( mapSize.width() ) );
-
     // add layers to map settings
     mapSettings.setLayers( layers );
 
@@ -1033,6 +1028,9 @@ namespace QgsWms
 
     mapSettings.setExtent( mapExtent );
 
+    // set the extent buffer
+    mapSettings.setExtentBuffer( mContext.mapTileBuffer( paintDevice->width() ) );
+
     /* Define the background color
      * Transparent or colored
      */