# HG changeset patch
# User Benjamin Golinvaux <bgo@osimis.io>
# Date 1558965707 -7200
# Node ID e76c4eef1054a3dc27dc16e44167bc7661dd3ced
# Parent  1a28fce57ff3e93c02569aea3910a97b6c12f9e3# Parent  cd13a062c9bda0beda112919bc5fd7c13e553532
Merge from default

diff -r cd13a062c9bd -r e76c4eef1054 Samples/Sdl/Loader.cpp
--- a/Samples/Sdl/Loader.cpp	Mon May 27 15:54:53 2019 +0200
+++ b/Samples/Sdl/Loader.cpp	Mon May 27 16:01:47 2019 +0200
@@ -46,6 +46,7 @@
 #include <Core/Images/Image.h>
 #include <Core/Images/ImageProcessing.h>
 #include <Core/Images/PngWriter.h>
+#include <Core/Endianness.h>
 #include <Core/Logging.h>
 #include <Core/OrthancException.h>
 #include <Core/SystemToolbox.h>
diff -r cd13a062c9bd -r e76c4eef1054 Samples/Sdl/TrackerSampleApp.cpp
--- a/Samples/Sdl/TrackerSampleApp.cpp	Mon May 27 15:54:53 2019 +0200
+++ b/Samples/Sdl/TrackerSampleApp.cpp	Mon May 27 16:01:47 2019 +0200
@@ -40,7 +40,10 @@
 #include <Core/Images/ImageProcessing.h>
 #include <Core/Images/PngWriter.h>
 
+#include <boost/ref.hpp>
+#include <boost/make_shared.hpp>
 #include <SDL.h>
+
 #include <stdio.h>
 
 using namespace Orthanc;
@@ -200,7 +203,7 @@
       {
         CreateLineMeasureCommandPtr cmd = 
           boost::make_shared<CreateLineMeasureCommand>(
-            IObserver::GetBroker(),
+		  boost::ref(IObserver::GetBroker()),
             controller_,
             GetRandomPointInScene());
         cmd->SetEnd(GetRandomPointInScene());
@@ -212,7 +215,7 @@
       {
       CreateAngleMeasureCommandPtr cmd =
         boost::make_shared<CreateAngleMeasureCommand>(
-          IObserver::GetBroker(),
+          boost::ref(IObserver::GetBroker()),
           controller_,
           GetRandomPointInScene());
         cmd->SetCenter(GetRandomPointInScene());