# HG changeset patch # User Sebastien Jodogne # Date 1521572530 -3600 # Node ID fccffbf99ba137f1ff89aed84d3c1ca6b3b111a1 # Parent 7a031ac16b2d112d4e0a5ace6c15c07425ca444d# Parent 4cff7b1ed31d61e13f5b4ea0def276702c768c0d integration mainline->wasm diff -r 7a031ac16b2d -r fccffbf99ba1 Applications/BasicApplicationContext.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Applications/BasicApplicationContext.h diff -r 7a031ac16b2d -r fccffbf99ba1 Applications/IBasicApplication.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Applications/Samples/SampleInteractor.h diff -r 7a031ac16b2d -r fccffbf99ba1 Applications/Samples/SingleFrameApplication.h diff -r 7a031ac16b2d -r fccffbf99ba1 Applications/Samples/SingleVolumeApplication.h diff -r 7a031ac16b2d -r fccffbf99ba1 Applications/Samples/SynchronizedSeriesApplication.h diff -r 7a031ac16b2d -r fccffbf99ba1 Applications/Samples/TestPatternApplication.h diff -r 7a031ac16b2d -r fccffbf99ba1 Applications/Sdl/SdlEngine.cpp --- a/Applications/Sdl/SdlEngine.cpp Tue Mar 20 14:46:58 2018 +0100 +++ b/Applications/Sdl/SdlEngine.cpp Tue Mar 20 20:02:10 2018 +0100 @@ -24,7 +24,6 @@ #if ORTHANC_ENABLE_SDL == 1 #include - #include namespace OrthancStone diff -r 7a031ac16b2d -r fccffbf99ba1 Applications/Sdl/SdlEngine.h diff -r 7a031ac16b2d -r fccffbf99ba1 Applications/Sdl/SdlWindow.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/CircleMeasureTracker.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/CircleMeasureTracker.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/ColorFrameRenderer.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/ColorFrameRenderer.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/DicomStructureSetRendererFactory.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/DicomStructureSetRendererFactory.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/FrameRenderer.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/FrameRenderer.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/GrayscaleFrameRenderer.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/GrayscaleFrameRenderer.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/ILayerRenderer.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/LineLayerRenderer.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/LineLayerRenderer.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/LineMeasureTracker.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/LineMeasureTracker.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/RenderStyle.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/SeriesFrameRendererFactory.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/SiblingSliceLocationFactory.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/SiblingSliceLocationFactory.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/SingleFrameRendererFactory.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Layers/SingleFrameRendererFactory.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/StoneEnumerations.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/CoordinateSystem3D.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/CoordinateSystem3D.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/DicomFrameConverter.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/DicomFrameConverter.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/DicomStructureSet.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/DicomStructureSet.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/DownloadStack.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/DownloadStack.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/GeometryToolbox.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/GeometryToolbox.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/ISeriesLoader.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/MessagingToolbox.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/MessagingToolbox.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/ObserversRegistry.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/ParallelSlices.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/ParallelSlices.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/ParallelSlicesCursor.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/ParallelSlicesCursor.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/ViewportGeometry.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Toolbox/ViewportGeometry.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Viewport/CairoContext.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Viewport/CairoFont.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Viewport/CairoSurface.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Viewport/CairoSurface.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Viewport/IMouseTracker.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Viewport/IStatusBar.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Viewport/IViewport.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Viewport/WidgetViewport.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Viewport/WidgetViewport.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Volumes/ImageBuffer3D.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Volumes/ImageBuffer3D.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/CairoWidget.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/EmptyWidget.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/EmptyWidget.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/IWidget.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/IWorldSceneInteractor.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/IWorldSceneMouseTracker.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/LayoutWidget.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/LayoutWidget.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/TestCairoWidget.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/TestCairoWidget.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/TestWorldSceneWidget.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/TestWorldSceneWidget.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/WidgetBase.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/WidgetBase.h diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/WorldSceneWidget.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Framework/Widgets/WorldSceneWidget.h diff -r 7a031ac16b2d -r fccffbf99ba1 Resources/CMake/BoostExtendedConfiguration.cmake diff -r 7a031ac16b2d -r fccffbf99ba1 Resources/CMake/CairoConfiguration.cmake diff -r 7a031ac16b2d -r fccffbf99ba1 Resources/CMake/OrthancStoneConfiguration.cmake diff -r 7a031ac16b2d -r fccffbf99ba1 Resources/Graveyard/Threading/BinarySemaphore.cpp diff -r 7a031ac16b2d -r fccffbf99ba1 Resources/Graveyard/Threading/BinarySemaphore.h diff -r 7a031ac16b2d -r fccffbf99ba1 Resources/Graveyard/Threading/IThreadSafety.h diff -r 7a031ac16b2d -r fccffbf99ba1 Resources/Graveyard/Threading/SdlBuffering.cpp --- a/Resources/Graveyard/Threading/SdlBuffering.cpp Tue Mar 20 14:46:58 2018 +0100 +++ b/Resources/Graveyard/Threading/SdlBuffering.cpp Tue Mar 20 20:02:10 2018 +0100 @@ -23,8 +23,8 @@ #if ORTHANC_ENABLE_SDL == 1 -#include "../../../Resources/Orthanc/Core/Logging.h" -#include "../../../Resources/Orthanc/Core/OrthancException.h" +#include "../../Resources/Orthanc/Core/Logging.h" +#include "../../Resources/Orthanc/Core/OrthancException.h" namespace OrthancStone { diff -r 7a031ac16b2d -r fccffbf99ba1 Resources/Graveyard/Threading/SdlBuffering.h diff -r 7a031ac16b2d -r fccffbf99ba1 Resources/Graveyard/Threading/SharedValue.h diff -r 7a031ac16b2d -r fccffbf99ba1 UnitTestsSources/UnitTestsMain.cpp