# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1621267427 -7200
# Node ID fe5c7311a7fdd3ee91853db875d4a6a1e8ad0227
# Parent  c5e6379b9cd01d6a1d34ec82c6487c1832b64394
fix for msvc 2008

diff -r c5e6379b9cd0 -r fe5c7311a7fd OrthancStone/Sources/Scene2DViewport/AngleMeasureTool.cpp
--- a/OrthancStone/Sources/Scene2DViewport/AngleMeasureTool.cpp	Mon May 17 17:23:54 2021 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/AngleMeasureTool.cpp	Mon May 17 18:03:47 2021 +0200
@@ -207,19 +207,23 @@
       scene.GetCanvasToSceneTransform());
 
     if (!HitTest(scenePos))
-      return boost::shared_ptr<IFlexiblePointerTracker>();
+    {
+      return boost::shared_ptr<IFlexiblePointerTracker>(); // NULL
+    }
+    else
+    {
+      /**
+         new EditLineMeasureTracker(
+         boost::shared_ptr<LineMeasureTool> measureTool;
+         MessageBroker & broker,
+         boost::weak_ptr<IViewport>          viewport,
+         const PointerEvent & e);
+      */
 
-    /**
-      new EditLineMeasureTracker(
-        boost::shared_ptr<LineMeasureTool> measureTool;
-        MessageBroker & broker,
-        boost::weak_ptr<IViewport>          viewport,
-        const PointerEvent & e);
-    */
-
-    boost::shared_ptr<EditAngleMeasureTracker> editAngleMeasureTracker(
-      new EditAngleMeasureTracker(shared_from_this(), viewport_, e));
-    return editAngleMeasureTracker;
+      boost::shared_ptr<EditAngleMeasureTracker> editAngleMeasureTracker(
+        new EditAngleMeasureTracker(shared_from_this(), viewport_, e));
+      return editAngleMeasureTracker;
+    }
   }
 
   void AngleMeasureTool::SetCenter(ScenePoint2D pt)
diff -r c5e6379b9cd0 -r fe5c7311a7fd OrthancStone/Sources/Scene2DViewport/LineMeasureTool.cpp
--- a/OrthancStone/Sources/Scene2DViewport/LineMeasureTool.cpp	Mon May 17 17:23:54 2021 +0200
+++ b/OrthancStone/Sources/Scene2DViewport/LineMeasureTool.cpp	Mon May 17 18:03:47 2021 +0200
@@ -166,15 +166,19 @@
         scene.GetCanvasToSceneTransform());
 
       if (!HitTest(scenePos))
-        return boost::shared_ptr<IFlexiblePointerTracker>();
-
-      boost::shared_ptr<EditLineMeasureTracker> editLineMeasureTracker(
-        new EditLineMeasureTracker(shared_from_this(), viewport_, e));
-      return editLineMeasureTracker;
+      {
+        return boost::shared_ptr<IFlexiblePointerTracker>();  // NULL
+      }
+      else
+      {
+        boost::shared_ptr<EditLineMeasureTracker> editLineMeasureTracker(
+          new EditLineMeasureTracker(shared_from_this(), viewport_, e));
+        return editLineMeasureTracker;
+      }
     }
     else
     {
-      return NULL;
+      return boost::shared_ptr<IFlexiblePointerTracker>();  // NULL
     }
   }