changeset 196:fccffbf99ba1 wasm

integration mainline->wasm
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 20 Mar 2018 20:02:10 +0100
parents 7a031ac16b2d (current diff) 4cff7b1ed31d (diff)
children fc3f85b29b43 ccdabaea1008
files Applications/BasicApplicationContext.cpp Applications/BasicApplicationContext.h Applications/IBasicApplication.cpp Applications/Samples/SampleInteractor.h Applications/Samples/SingleFrameApplication.h Applications/Samples/SingleVolumeApplication.h Applications/Samples/SynchronizedSeriesApplication.h Applications/Samples/TestPatternApplication.h Applications/Sdl/SdlEngine.cpp Applications/Sdl/SdlEngine.h Applications/Sdl/SdlWindow.cpp Framework/Layers/CircleMeasureTracker.cpp Framework/Layers/CircleMeasureTracker.h Framework/Layers/ColorFrameRenderer.cpp Framework/Layers/ColorFrameRenderer.h Framework/Layers/DicomStructureSetRendererFactory.cpp Framework/Layers/DicomStructureSetRendererFactory.h Framework/Layers/FrameRenderer.cpp Framework/Layers/FrameRenderer.h Framework/Layers/GrayscaleFrameRenderer.cpp Framework/Layers/GrayscaleFrameRenderer.h Framework/Layers/ILayerRenderer.h Framework/Layers/LineLayerRenderer.cpp Framework/Layers/LineLayerRenderer.h Framework/Layers/LineMeasureTracker.cpp Framework/Layers/LineMeasureTracker.h Framework/Layers/RenderStyle.cpp Framework/Layers/SeriesFrameRendererFactory.cpp Framework/Layers/SiblingSliceLocationFactory.cpp Framework/Layers/SiblingSliceLocationFactory.h Framework/Layers/SingleFrameRendererFactory.cpp Framework/Layers/SingleFrameRendererFactory.h Framework/StoneEnumerations.h Framework/Toolbox/CoordinateSystem3D.cpp Framework/Toolbox/CoordinateSystem3D.h Framework/Toolbox/DicomFrameConverter.cpp Framework/Toolbox/DicomFrameConverter.h Framework/Toolbox/DicomStructureSet.cpp Framework/Toolbox/DicomStructureSet.h Framework/Toolbox/DownloadStack.cpp Framework/Toolbox/DownloadStack.h Framework/Toolbox/GeometryToolbox.cpp Framework/Toolbox/GeometryToolbox.h Framework/Toolbox/ISeriesLoader.h Framework/Toolbox/MessagingToolbox.cpp Framework/Toolbox/MessagingToolbox.h Framework/Toolbox/ObserversRegistry.h Framework/Toolbox/ParallelSlices.cpp Framework/Toolbox/ParallelSlices.h Framework/Toolbox/ParallelSlicesCursor.cpp Framework/Toolbox/ParallelSlicesCursor.h Framework/Toolbox/ViewportGeometry.cpp Framework/Toolbox/ViewportGeometry.h Framework/Viewport/CairoContext.cpp Framework/Viewport/CairoFont.cpp Framework/Viewport/CairoSurface.cpp Framework/Viewport/CairoSurface.h Framework/Viewport/IMouseTracker.h Framework/Viewport/IStatusBar.h Framework/Viewport/IViewport.h Framework/Viewport/WidgetViewport.cpp Framework/Viewport/WidgetViewport.h Framework/Volumes/ImageBuffer3D.cpp Framework/Volumes/ImageBuffer3D.h Framework/Widgets/CairoWidget.cpp Framework/Widgets/EmptyWidget.cpp Framework/Widgets/EmptyWidget.h Framework/Widgets/IWidget.h Framework/Widgets/IWorldSceneInteractor.h Framework/Widgets/IWorldSceneMouseTracker.h Framework/Widgets/LayoutWidget.cpp Framework/Widgets/LayoutWidget.h Framework/Widgets/TestCairoWidget.cpp Framework/Widgets/TestCairoWidget.h Framework/Widgets/TestWorldSceneWidget.cpp Framework/Widgets/TestWorldSceneWidget.h Framework/Widgets/WidgetBase.cpp Framework/Widgets/WidgetBase.h Framework/Widgets/WorldSceneWidget.cpp Framework/Widgets/WorldSceneWidget.h Resources/CMake/BoostExtendedConfiguration.cmake Resources/CMake/CairoConfiguration.cmake Resources/CMake/OrthancStoneConfiguration.cmake Resources/Graveyard/Threading/BinarySemaphore.cpp Resources/Graveyard/Threading/BinarySemaphore.h Resources/Graveyard/Threading/IThreadSafety.h Resources/Graveyard/Threading/SdlBuffering.cpp Resources/Graveyard/Threading/SdlBuffering.h Resources/Graveyard/Threading/SharedValue.h UnitTestsSources/UnitTestsMain.cpp
diffstat 2 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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 <Core/Logging.h>
-
 #include <SDL.h>
 
 namespace OrthancStone
--- 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
 {