--- a/Framework/Scene2DViewport/MeasureToolsToolbox.h	Wed Jul 10 15:23:13 2019 +0200
+++ b/Framework/Scene2DViewport/MeasureToolsToolbox.h	Wed Jul 10 18:18:42 2019 +0200
@@ -31,9 +31,9 @@
   square sides are parallel to the canvas boundaries.
   */
   void AddSquare(PolylineSceneLayer::Chain& chain,
-    boost::shared_ptr<const Scene2D>     scene,
-    const ScenePoint2D& centerS,
-    const double& sideLengthS);
+                 const Scene2D&     scene,
+                 const ScenePoint2D& centerS,
+                 const double& sideLengthS);
 
   /**
     Creates an arc centered on c that goes
@@ -180,10 +180,11 @@
   from layerIndex, up to (and not including) layerIndex+5.
   */
   void SetTextLayerOutlineProperties(
-    boost::shared_ptr<Scene2D> scene, boost::shared_ptr<LayerHolder> layerHolder,
-    const char* text, ScenePoint2D p);
+    Scene2D& scene,
+    boost::shared_ptr<LayerHolder> layerHolder,
+    const char* text,
+    ScenePoint2D p);
 
-
-  std::ostream& operator<<(std::ostream& os, const ScenePoint2D& p);
+  std::ostream& operator<<(std::ostream& os, const ScenePoint2D& p);
 }