Mercurial > hg > orthanc-stone

changeset 791:907189734acd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 28 May 2019 08:29:24 +0200
parents 9f68155c75b0 (current diff) c83a45f864b2 (diff)
children 4fe4b221a31f
files
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Samples/Sdl/Loader.cpp	Tue May 28 08:29:01 2019 +0200
+++ b/Samples/Sdl/Loader.cpp	Tue May 28 08:29:24 2019 +0200
@@ -47,6 +47,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>
--- a/Samples/Sdl/TrackerSampleApp.cpp	Tue May 28 08:29:01 2019 +0200
+++ b/Samples/Sdl/TrackerSampleApp.cpp	Tue May 28 08:29:24 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());