# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1583169105 -3600
# Node ID 257f2c9a02ac0d4841f9b80ccce9f5892ea8f341
# Parent  c38c89684d83898183e47618246406827d6b609a# Parent  8a0a62189f464fdfd90b471f237e35384649bb85
integration mainline->broker

diff -r c38c89684d83 -r 257f2c9a02ac Applications/Generic/GuiAdapter.cpp
--- a/Applications/Generic/GuiAdapter.cpp	Mon Mar 02 17:21:24 2020 +0100
+++ b/Applications/Generic/GuiAdapter.cpp	Mon Mar 02 18:11:45 2020 +0100
@@ -34,6 +34,8 @@
 #  include "../../Framework/Deprecated/Messages/LockingEmitter.h"
 #endif
 
+#include <Core/Compatibility.h>
+
 namespace OrthancStone
 {
   std::ostream& operator<<(
diff -r c38c89684d83 -r 257f2c9a02ac Applications/Samples/SimpleViewerApplicationSingleFile.h
diff -r c38c89684d83 -r 257f2c9a02ac Applications/Samples/SingleFrameApplication.h
--- a/Applications/Samples/SingleFrameApplication.h	Mon Mar 02 17:21:24 2020 +0100
+++ b/Applications/Samples/SingleFrameApplication.h	Mon Mar 02 18:11:45 2020 +0100
@@ -243,6 +243,7 @@
         boost::shared_ptr<Deprecated::DicomSeriesVolumeSlicer> layer(new Deprecated::DicomSeriesVolumeSlicer);
         layer->Connect(context->GetOrthancApiClient());
         source_ = layer;
+
         layer->LoadFrame(instance, frame);
         Register<Deprecated::IVolumeSlicer::GeometryReadyMessage>(*layer, &SingleFrameApplication::OnMainWidgetGeometryReady);
         widget_->AddLayer(layer);
diff -r c38c89684d83 -r 257f2c9a02ac Applications/Samples/SingleFrameEditorApplication.h
diff -r c38c89684d83 -r 257f2c9a02ac Applications/Sdl/SdlCairoSurface.h
--- a/Applications/Sdl/SdlCairoSurface.h	Mon Mar 02 17:21:24 2020 +0100
+++ b/Applications/Sdl/SdlCairoSurface.h	Mon Mar 02 18:11:45 2020 +0100
@@ -27,8 +27,9 @@
 #include "../../Framework/Wrappers/CairoSurface.h"
 #include "../../Framework/Deprecated/Viewport/IViewport.h"
 
+#include <Core/Compatibility.h>
+
 #include <SDL_render.h>
-
 #include <boost/thread/mutex.hpp>
 
 namespace OrthancStone
diff -r c38c89684d83 -r 257f2c9a02ac Applications/Sdl/SdlOrthancSurface.h
--- a/Applications/Sdl/SdlOrthancSurface.h	Mon Mar 02 17:21:24 2020 +0100
+++ b/Applications/Sdl/SdlOrthancSurface.h	Mon Mar 02 18:11:45 2020 +0100
@@ -25,7 +25,9 @@
 
 #include "../../Framework/Viewport/SdlWindow.h"
 
+#include <Core/Compatibility.h>
 #include <Core/Images/ImageAccessor.h>
+
 #include <boost/thread/mutex.hpp>
 
 namespace OrthancStone
diff -r c38c89684d83 -r 257f2c9a02ac Applications/StoneApplicationContext.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Loaders/DicomStructureSetLoader.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Loaders/DicomStructureSetLoader.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Loaders/DicomStructureSetLoader2.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Loaders/LoaderStateMachine.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Loaders/OrthancMultiframeVolumeLoader.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Loaders/OrthancSeriesVolumeProgressiveLoader.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/SmartLoader.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Toolbox/BaseWebService.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Toolbox/OrthancApiClient.cpp
--- a/Framework/Deprecated/Toolbox/OrthancApiClient.cpp	Mon Mar 02 17:21:24 2020 +0100
+++ b/Framework/Deprecated/Toolbox/OrthancApiClient.cpp	Mon Mar 02 18:11:45 2020 +0100
@@ -73,6 +73,7 @@
     std::unique_ptr< MessageHandler<BinaryResponseReadyMessage> >            binaryHandler_;
     std::unique_ptr< MessageHandler<IWebService::HttpRequestErrorMessage> >  failureHandler_;
     std::unique_ptr< Orthanc::IDynamicObject >                               userPayload_;
+
     void NotifyConversionError(const IWebService::HttpRequestSuccessMessage& message) const
     {
       if (failureHandler_.get() != NULL)
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Toolbox/OrthancSlicesLoader.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Viewport/WidgetViewport.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Volumes/StructureSetLoader.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Volumes/StructureSetLoader.h
--- a/Framework/Deprecated/Volumes/StructureSetLoader.h	Mon Mar 02 17:21:24 2020 +0100
+++ b/Framework/Deprecated/Volumes/StructureSetLoader.h	Mon Mar 02 18:11:45 2020 +0100
@@ -26,6 +26,8 @@
 #include "../Toolbox/OrthancApiClient.h"
 #include "IVolumeLoader.h"
 
+#include <Core/Compatibility.h>
+
 namespace Deprecated
 {
   class StructureSetLoader :
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Widgets/LayoutWidget.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Widgets/LayoutWidget.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Widgets/SliceViewerWidget.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Deprecated/Widgets/SliceViewerWidget.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Fonts/GlyphTextureAlphabet.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Oracle/GetOrthancImageCommand.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Oracle/GetOrthancImageCommand.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Oracle/GetOrthancWebViewerJpegCommand.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Oracle/GetOrthancWebViewerJpegCommand.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Oracle/OracleCommandBase.h
--- a/Framework/Oracle/OracleCommandBase.h	Mon Mar 02 17:21:24 2020 +0100
+++ b/Framework/Oracle/OracleCommandBase.h	Mon Mar 02 18:11:45 2020 +0100
@@ -24,6 +24,7 @@
 #include "IOracleCommand.h"
 
 #include <Core/Compatibility.h>
+#include <Core/IDynamicObject.h>
 
 #include <memory>
 
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Oracle/ThreadedOracle.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Oracle/WebAssemblyOracle.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Radiography/RadiographyAlphaLayer.cpp
--- a/Framework/Radiography/RadiographyAlphaLayer.cpp	Mon Mar 02 17:21:24 2020 +0100
+++ b/Framework/Radiography/RadiographyAlphaLayer.cpp	Mon Mar 02 18:11:45 2020 +0100
@@ -23,8 +23,10 @@
 
 #include "RadiographyScene.h"
 
+#include <Core/Compatibility.h>
 #include <Core/Images/Image.h>
 #include <Core/OrthancException.h>
+
 #include "../Toolbox/ImageGeometry.h"
 
 namespace OrthancStone
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Radiography/RadiographyAlphaLayer.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Radiography/RadiographyDicomLayer.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Radiography/RadiographyDicomLayer.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Radiography/RadiographyMaskLayer.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Radiography/RadiographyScene.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Radiography/RadiographySceneReader.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Radiography/RadiographySceneReader.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Radiography/RadiographyWidget.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Scene2D/CairoCompositor.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Scene2D/CairoCompositor.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Scene2D/FloatTextureSceneLayer.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Scene2D/GrayscaleStyleConfigurator.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Scene2D/Internals/CompositorHelper.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Scene2D/Internals/OpenGLTextureProgram.h
--- a/Framework/Scene2D/Internals/OpenGLTextureProgram.h	Mon Mar 02 17:21:24 2020 +0100
+++ b/Framework/Scene2D/Internals/OpenGLTextureProgram.h	Mon Mar 02 18:11:45 2020 +0100
@@ -26,6 +26,8 @@
 #include "../../OpenGL/OpenGLTexture.h"
 #include "../../Toolbox/AffineTransform2D.h"
 
+#include <Core/Compatibility.h>
+
 namespace OrthancStone
 {
   namespace Internals
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Scene2D/LookupTableTextureSceneLayer.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Scene2D/OpenGLCompositor.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Scene2D/Scene2D.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Scene2DViewport/LayerHolder.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Toolbox/DicomInstanceParameters.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Toolbox/SlicesSorter.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Viewport/SdlViewport.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Viewport/WebAssemblyViewport.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Volumes/DicomVolumeImage.h
diff -r c38c89684d83 -r 257f2c9a02ac Framework/Volumes/DicomVolumeImageMPRSlicer.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Platforms/Generic/DelayedCallCommand.h
diff -r c38c89684d83 -r 257f2c9a02ac Platforms/Generic/OracleWebService.cpp
diff -r c38c89684d83 -r 257f2c9a02ac Platforms/Generic/WebServiceCommandBase.h
diff -r c38c89684d83 -r 257f2c9a02ac Resources/CMake/OrthancStoneParameters.cmake
--- a/Resources/CMake/OrthancStoneParameters.cmake	Mon Mar 02 17:21:24 2020 +0100
+++ b/Resources/CMake/OrthancStoneParameters.cmake	Mon Mar 02 18:11:45 2020 +0100
@@ -52,6 +52,6 @@
 ## the Stone of Orthanc
 #####################################################################
 
-set(ENABLE_OPENGL ON CACHE INTERNAL "Enable support of OpenGL")
+set(ENABLE_OPENGL ON CACHE BOOL "Enable support of OpenGL")
 set(ENABLE_WASM OFF CACHE INTERNAL "Enable support of WebAssembly")
 set(ENABLE_STONE_DEPRECATED OFF CACHE INTERNAL "Enable backward compatibility with deprecated Stone classes")