Mercurial > hg > orthanc-stone
changeset 1300:257f2c9a02ac broker
integration mainline->broker
line wrap: on
line diff
--- 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<<(
--- 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);
--- 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
--- 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
--- 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)
--- 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 :
--- 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>
--- 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
--- 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
--- 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")