not using mContext from future integration received by cherry-pick

signedav · signedav · commit d4effad32c9c · 2019-04-22T11:33:04.000+02:00
diff --git a/src/server/services/wms/qgswmsrenderer.cpp b/src/server/services/wms/qgswmsrenderer.cpp
@@ -204,7 +204,7 @@ namespace QgsWms
     }
     else
     {
-      double defaultMapUnitsPerPixel = QgsServerProjectUtils::wmsDefaultMapUnitsPerMm( *mContext.project() ) / mContext.dotsPerMm();
+      double defaultMapUnitsPerPixel = QgsServerProjectUtils::wmsDefaultMapUnitsPerMm( *mProject ) / dpmm;
       legendSettings.setMapUnitsPerPixel( defaultMapUnitsPerPixel );
     }
 
@@ -246,11 +246,6 @@ namespace QgsWms
       legendRendererNew.drawLegend( painter.get() );
       painter->end();
     }
-    else
-    {
-      double defaultMapUnitsPerPixel = QgsServerProjectUtils::wmsDefaultMapUnitsPerMm( *mContext.project() ) / mContext.dotsPerMm();
-      settings.setMapUnitsPerPixel( defaultMapUnitsPerPixel );
-    }
 
     rootGroup.clear();
     return image.release();

Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ namespace QgsWms`
`204`	`204`	`}`
`205`	`205`	`else`
`206`	`206`	`{`
`207`		`- double defaultMapUnitsPerPixel = QgsServerProjectUtils::wmsDefaultMapUnitsPerMm( *mContext.project() ) / mContext.dotsPerMm();`
	`207`	`+ double defaultMapUnitsPerPixel = QgsServerProjectUtils::wmsDefaultMapUnitsPerMm( *mProject ) / dpmm;`
`208`	`208`	`legendSettings.setMapUnitsPerPixel( defaultMapUnitsPerPixel );`
`209`	`209`	`}`
`210`	`210`
`@@ -246,11 +246,6 @@ namespace QgsWms`
`246`	`246`	`legendRendererNew.drawLegend( painter.get() );`
`247`	`247`	`painter->end();`
`248`	`248`	`}`
`249`		`- else`
`250`		`- {`
`251`		`- double defaultMapUnitsPerPixel = QgsServerProjectUtils::wmsDefaultMapUnitsPerMm( *mContext.project() ) / mContext.dotsPerMm();`
`252`		`- settings.setMapUnitsPerPixel( defaultMapUnitsPerPixel );`
`253`		`- }`
`254`	`249`
`255`	`250`	`rootGroup.clear();`
`256`	`251`	`return image.release();`