# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1667056221 -7200
# Node ID b31e494e34c52c1dda58c42a5dc1a0adfc8ebbf1
# Parent  95449b0e064a1a3184b767423f4fa46145cec4ae
cppcheck

diff -r 95449b0e064a -r b31e494e34c5 OrthancStone/Sources/Scene2D/AnnotationsSceneLayer.cpp
--- a/OrthancStone/Sources/Scene2D/AnnotationsSceneLayer.cpp	Sat Oct 29 16:56:16 2022 +0200
+++ b/OrthancStone/Sources/Scene2D/AnnotationsSceneLayer.cpp	Sat Oct 29 17:10:21 2022 +0200
@@ -1053,7 +1053,11 @@
           }
           
           label_.SetText(buf);
-        }            
+        }
+        else
+        {
+          label_.SetText("?");
+        }
       }
     }
 
diff -r 95449b0e064a -r b31e494e34c5 OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.cpp
--- a/OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.cpp	Sat Oct 29 16:56:16 2022 +0200
+++ b/OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.cpp	Sat Oct 29 17:10:21 2022 +0200
@@ -29,7 +29,7 @@
 {
   namespace Internals
   {
-    FixedPointAligner::FixedPointAligner(ViewportController& controller,
+    FixedPointAligner::FixedPointAligner(const ViewportController& controller,
                                          const ScenePoint2D& p) :
       canvas_(p)
     {
diff -r 95449b0e064a -r b31e494e34c5 OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.h
--- a/OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.h	Sat Oct 29 16:56:16 2022 +0200
+++ b/OrthancStone/Sources/Scene2D/Internals/FixedPointAligner.h	Sat Oct 29 17:10:21 2022 +0200
@@ -37,7 +37,7 @@
       ScenePoint2D  canvas_;
 
     public:
-      FixedPointAligner(ViewportController& controller,
+      FixedPointAligner(const ViewportController& controller,
                         const ScenePoint2D& p);
 
       void Apply(ViewportController& controller);
diff -r 95449b0e064a -r b31e494e34c5 OrthancStone/Sources/Viewport/ViewportLocker.cpp
--- a/OrthancStone/Sources/Viewport/ViewportLocker.cpp	Sat Oct 29 16:56:16 2022 +0200
+++ b/OrthancStone/Sources/Viewport/ViewportLocker.cpp	Sat Oct 29 17:10:21 2022 +0200
@@ -40,9 +40,9 @@
   }
   
 
-  ViewportLocker::ViewportLocker(boost::weak_ptr<IViewport> viewport)
+  ViewportLocker::ViewportLocker(boost::weak_ptr<IViewport> viewport) :
+    lock1_(viewport.lock())
   {
-    lock1_ = viewport.lock();
     if (lock1_)
     {
       lock2_.reset(lock1_->Lock());
diff -r 95449b0e064a -r b31e494e34c5 OrthancStone/Sources/Viewport/ViewportLocker.h
--- a/OrthancStone/Sources/Viewport/ViewportLocker.h	Sat Oct 29 16:56:16 2022 +0200
+++ b/OrthancStone/Sources/Viewport/ViewportLocker.h	Sat Oct 29 17:10:21 2022 +0200
@@ -36,12 +36,12 @@
     IViewport::ILock& GetLock() const;
 
   public:
-    ViewportLocker(IViewport& viewport) :
+    explicit ViewportLocker(IViewport& viewport) :
       lock2_(viewport.Lock())
     {
     }
 
-    ViewportLocker(boost::weak_ptr<IViewport> viewport);
+    explicit ViewportLocker(boost::weak_ptr<IViewport> viewport);
 
     bool IsValid() const
     {