# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1593509381 -7200
# Node ID 1e381f2596d3ed04503b2a683686e3e14cd8059e
# Parent  6e832ff72a5eb0ccbdb5e546273fd3aa16c64b45
fix warnings

diff -r 6e832ff72a5e -r 1e381f2596d3 Framework/Scene2DViewport/MeasureTrackers.cpp
--- a/Framework/Scene2DViewport/MeasureTrackers.cpp	Tue Jun 30 10:29:10 2020 +0200
+++ b/Framework/Scene2DViewport/MeasureTrackers.cpp	Tue Jun 30 11:29:41 2020 +0200
@@ -49,7 +49,6 @@
     // otherwise, we simply undo it
 
     std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
-    ViewportController& controller = lock->GetController();
 
     if (commitResult_)
       lock->GetController().PushCommand(command_);
@@ -65,10 +64,9 @@
     , commitResult_(true)
   {
     std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
-    ViewportController& controller = lock->GetController();
 
     originalClickPosition_ = e.GetMainPosition().Apply(
-      controller.GetScene().GetCanvasToSceneTransform());
+      lock->GetController().GetScene().GetCanvasToSceneTransform());
   }
 
   void EditMeasureTracker::Cancel()
@@ -89,7 +87,6 @@
     // otherwise, we simply undo it
 
     std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
-    ViewportController& controller = lock->GetController();
 
     if (commitResult_)
       lock->GetController().PushCommand(command_);
diff -r 6e832ff72a5e -r 1e381f2596d3 Samples/Common/RtViewerView.cpp
--- a/Samples/Common/RtViewerView.cpp	Tue Jun 30 10:29:10 2020 +0200
+++ b/Samples/Common/RtViewerView.cpp	Tue Jun 30 11:29:41 2020 +0200
@@ -193,7 +193,7 @@
       }
       LOG(INFO) << "RtViewerView::Scroll(" << delta << ") --> slice is now = " << next;
 
-      if (next != currentPlane_)
+      if (next != static_cast<int>(currentPlane_))
       {
         currentPlane_ = next;
         UpdateLayers();
@@ -249,7 +249,6 @@
   {
     std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
     ViewportController& controller = lock->GetController();
-    Scene2D& scene = controller.GetScene();
     ICompositor& compositor = lock->GetCompositor();
 
     // False means we do NOT let a hi-DPI aware desktop managedr treat this as a legacy application that requires
@@ -276,7 +275,6 @@
   {
     std::unique_ptr<IViewport::ILock> lock(viewport_->Lock());
     ViewportController& controller = lock->GetController();
-    Scene2D& scene = controller.GetScene();
     Register<ViewportController::SceneTransformChanged>(controller, &RtViewerView::OnSceneTransformChanged);
   }
 
diff -r 6e832ff72a5e -r 1e381f2596d3 Samples/Sdl/SdlHelpers.h
--- a/Samples/Sdl/SdlHelpers.h	Tue Jun 30 10:29:10 2020 +0200
+++ b/Samples/Sdl/SdlHelpers.h	Tue Jun 30 11:29:41 2020 +0200
@@ -120,7 +120,8 @@
     p.SetShiftModifier( (modifiers & KeyboardModifiers_Shift) != 0);
   }
 
-  static boost::shared_ptr<OrthancStone::SdlViewport> GetSdlViewportFromWindowId(
+  
+  inline boost::shared_ptr<OrthancStone::SdlViewport> GetSdlViewportFromWindowId(
     const std::vector<boost::shared_ptr<OrthancStone::SdlViewport> >& viewports,
     Uint32 windowID)
   {
diff -r 6e832ff72a5e -r 1e381f2596d3 UnitTestsSources/PixelTestPatternsTests.cpp
--- a/UnitTestsSources/PixelTestPatternsTests.cpp	Tue Jun 30 10:29:10 2020 +0200
+++ b/UnitTestsSources/PixelTestPatternsTests.cpp	Tue Jun 30 11:29:41 2020 +0200
@@ -135,9 +135,6 @@
   uint8_t eeendG[NCELLS] = {000,255,000,255,255,000,255,000 };
   uint8_t eeendB[NCELLS] = {000,255,000,255,255,000,255,000 };
 
-  // vertical?
-  bool verticality[NCELLS] = { false,true,false,true,true,false,true,false };
-
   for(size_t slot = 0; slot < NCELLS; ++slot)
   {
     int x0 = (slot % 4) * CELLW;