# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1591854082 -7200
# Node ID f299c191cd7672abdc8bd707948829c94ea341ae
# Parent  ce70678d9a9cc8c7e78a8c6590c5959100a55a14
fix

diff -r ce70678d9a9c -r f299c191cd76 Applications/ApplicationToolbox.cpp
--- a/Applications/ApplicationToolbox.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Applications/ApplicationToolbox.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -24,12 +24,12 @@
 #include "../Framework/Inputs/OpenSlideLibrary.h"
 #include "../Framework/MultiThreading/BagOfTasksProcessor.h"
 
-#include <Core/DicomParsing/FromDcmtkBridge.h>
-#include <Core/HttpClient.h>
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Core/SystemToolbox.h>
-#include <Core/Toolbox.h>
+#include <DicomParsing/FromDcmtkBridge.h>
+#include <HttpClient.h>
+#include <Logging.h>
+#include <OrthancException.h>
+#include <SystemToolbox.h>
+#include <Toolbox.h>
 
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
diff -r ce70678d9a9c -r f299c191cd76 Applications/ApplicationToolbox.h
--- a/Applications/ApplicationToolbox.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Applications/ApplicationToolbox.h	Thu Jun 11 07:41:22 2020 +0200
@@ -23,7 +23,7 @@
 
 #include "../Framework/MultiThreading/BagOfTasks.h"
 
-#include <Core/WebServiceParameters.h>
+#include <WebServiceParameters.h>
 
 #include <string>
 #include <stdint.h>
diff -r ce70678d9a9c -r f299c191cd76 Applications/CMakeLists.txt
--- a/Applications/CMakeLists.txt	Tue Jun 09 07:29:21 2020 +0200
+++ b/Applications/CMakeLists.txt	Thu Jun 11 07:41:22 2020 +0200
@@ -50,7 +50,10 @@
 
 include(${ORTHANC_ROOT}/Resources/CMake/VisualStudioPrecompiledHeaders.cmake)
 include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake)
-include_directories(${ORTHANC_ROOT})
+include_directories(
+  ${ORTHANC_ROOT}/Core/
+  ${ORTHANC_ROOT}/Plugins/Samples/Common/
+  )
 
 
 # Include components specific to WSI
@@ -153,13 +156,14 @@
 #####################################################################
 
 add_library(OrthancWSIFramework STATIC
+  ${ORTHANC_WSI_PCH}
+  ${ORTHANC_WSI_SOURCES}
+
   ${ORTHANC_CORE_PCH}
   ${ORTHANC_CORE_SOURCES_INTERNAL}
   ${ORTHANC_CORE_SOURCES_DEPENDENCIES}
   ${ORTHANC_DICOM_SOURCES_INTERNAL}
   ${ORTHANC_DICOM_SOURCES_DEPENDENCIES}
-  ${ORTHANC_WSI_PCH}
-  ${ORTHANC_WSI_SOURCES}
   ${AUTOGENERATED_SOURCES}
   ${BOOST_EXTENDED_SOURCES}
 
diff -r ce70678d9a9c -r f299c191cd76 Applications/DicomToTiff.cpp
--- a/Applications/DicomToTiff.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Applications/DicomToTiff.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -25,9 +25,9 @@
 #include "../Framework/Inputs/TiledPyramidStatistics.h"
 #include "../Framework/Outputs/HierarchicalTiffWriter.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Plugins/Samples/Common/OrthancHttpConnection.h>
+#include <Logging.h>
+#include <OrthancException.h>
+#include <OrthancHttpConnection.h>
 
 #include "ApplicationToolbox.h"
 
diff -r ce70678d9a9c -r f299c191cd76 Applications/Dicomizer.cpp
--- a/Applications/Dicomizer.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Applications/Dicomizer.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -33,10 +33,10 @@
 #include "../Framework/Outputs/DicomPyramidWriter.h"
 #include "../Framework/Outputs/TruncatedPyramidWriter.h"
 
-#include <Core/DicomParsing/FromDcmtkBridge.h>
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Core/SystemToolbox.h>
+#include <DicomParsing/FromDcmtkBridge.h>
+#include <Logging.h>
+#include <OrthancException.h>
+#include <SystemToolbox.h>
 
 #include "ApplicationToolbox.h"
 
diff -r ce70678d9a9c -r f299c191cd76 Framework/Algorithms/PyramidReader.cpp
--- a/Framework/Algorithms/PyramidReader.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Algorithms/PyramidReader.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -23,8 +23,8 @@
 #include "PyramidReader.h"
 
 #include "../ImageToolbox.h"
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include <Logging.h>
+#include <OrthancException.h>
 
 #include <cassert>
 
diff -r ce70678d9a9c -r f299c191cd76 Framework/Algorithms/ReconstructPyramidCommand.cpp
--- a/Framework/Algorithms/ReconstructPyramidCommand.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Algorithms/ReconstructPyramidCommand.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -23,9 +23,9 @@
 #include "ReconstructPyramidCommand.h"
 
 #include "../ImageToolbox.h"
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Core/Images/Image.h>
+#include <Logging.h>
+#include <OrthancException.h>
+#include <Images/Image.h>
 
 #include <cassert>
 
diff -r ce70678d9a9c -r f299c191cd76 Framework/Algorithms/TranscodeTileCommand.cpp
--- a/Framework/Algorithms/TranscodeTileCommand.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Algorithms/TranscodeTileCommand.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,8 +22,8 @@
 #include "../PrecompiledHeadersWSI.h"
 #include "TranscodeTileCommand.h"
 
-#include <Core/OrthancException.h>
-#include <Core/Logging.h>
+#include <OrthancException.h>
+#include <Logging.h>
 
 #include <cassert>
 
diff -r ce70678d9a9c -r f299c191cd76 Framework/DicomToolbox.cpp
--- a/Framework/DicomToolbox.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/DicomToolbox.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,9 +22,9 @@
 #include "PrecompiledHeadersWSI.h"
 #include "DicomToolbox.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Core/Toolbox.h>
+#include <Logging.h>
+#include <OrthancException.h>
+#include <Toolbox.h>
 
 #if ORTHANC_ENABLE_DCMTK == 1
 #  include <dcmtk/dcmdata/dcelem.h>
diff -r ce70678d9a9c -r f299c191cd76 Framework/DicomizerParameters.cpp
--- a/Framework/DicomizerParameters.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/DicomizerParameters.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -25,7 +25,7 @@
 #include "Targets/FolderTarget.h"
 #include "Targets/OrthancTarget.h"
 
-#include <Core/OrthancException.h>
+#include <OrthancException.h>
 
 #include <boost/thread.hpp>
 #include <boost/lexical_cast.hpp>
diff -r ce70678d9a9c -r f299c191cd76 Framework/DicomizerParameters.h
--- a/Framework/DicomizerParameters.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/DicomizerParameters.h	Thu Jun 11 07:41:22 2020 +0200
@@ -25,7 +25,7 @@
 #include "Outputs/IPyramidWriter.h"
 #include "Targets/IFileTarget.h"
 #include "DicomToolbox.h"
-#include <Core/WebServiceParameters.h>
+#include <WebServiceParameters.h>
 
 #include <stdint.h>
 
diff -r ce70678d9a9c -r f299c191cd76 Framework/Enumerations.cpp
--- a/Framework/Enumerations.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Enumerations.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -23,9 +23,9 @@
 #include "Enumerations.h"
 
 #include "Jpeg2000Reader.h"
-#include <Core/OrthancException.h>
-#include <Core/SystemToolbox.h>
-#include <Core/Toolbox.h>
+#include <OrthancException.h>
+#include <SystemToolbox.h>
+#include <Toolbox.h>
 
 #include <string.h>
 #include <boost/algorithm/string/predicate.hpp>
diff -r ce70678d9a9c -r f299c191cd76 Framework/Enumerations.h
--- a/Framework/Enumerations.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Enumerations.h	Thu Jun 11 07:41:22 2020 +0200
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <Core/Enumerations.h>
+#include <Enumerations.h>
 
 #include <stdint.h>
 #include <string>
diff -r ce70678d9a9c -r f299c191cd76 Framework/ImageToolbox.cpp
--- a/Framework/ImageToolbox.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/ImageToolbox.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -25,13 +25,13 @@
 #include "Jpeg2000Reader.h"
 #include "Jpeg2000Writer.h"
 
-#include <Core/OrthancException.h>
-#include <Core/Images/ImageProcessing.h>
-#include <Core/Images/PngReader.h>
-#include <Core/Images/PngWriter.h>
-#include <Core/Images/JpegReader.h>
-#include <Core/Images/JpegWriter.h>
-#include <Core/Logging.h>
+#include <OrthancException.h>
+#include <Images/ImageProcessing.h>
+#include <Images/PngReader.h>
+#include <Images/PngWriter.h>
+#include <Images/JpegReader.h>
+#include <Images/JpegWriter.h>
+#include <Logging.h>
 
 #include <string.h>
 #include <memory>
diff -r ce70678d9a9c -r f299c191cd76 Framework/ImageToolbox.h
--- a/Framework/ImageToolbox.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/ImageToolbox.h	Thu Jun 11 07:41:22 2020 +0200
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <Core/Images/ImageAccessor.h>
+#include <Images/ImageAccessor.h>
 #include "Enumerations.h"
 #include "Inputs/ITiledPyramid.h"
 
diff -r ce70678d9a9c -r f299c191cd76 Framework/ImagedVolumeParameters.cpp
--- a/Framework/ImagedVolumeParameters.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/ImagedVolumeParameters.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,7 +22,7 @@
 #include "PrecompiledHeadersWSI.h"
 #include "ImagedVolumeParameters.h"
 
-#include <Core/OrthancException.h>
+#include <OrthancException.h>
 
 namespace OrthancWSI
 {
diff -r ce70678d9a9c -r f299c191cd76 Framework/Inputs/DicomPyramid.cpp
--- a/Framework/Inputs/DicomPyramid.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Inputs/DicomPyramid.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -23,8 +23,8 @@
 #include "DicomPyramid.h"
 
 #include "../DicomToolbox.h"
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include <Logging.h>
+#include <OrthancException.h>
 
 #include <algorithm>
 #include <cassert>
diff -r ce70678d9a9c -r f299c191cd76 Framework/Inputs/DicomPyramidInstance.cpp
--- a/Framework/Inputs/DicomPyramidInstance.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Inputs/DicomPyramidInstance.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,11 +22,13 @@
 #include "../PrecompiledHeadersWSI.h"
 #include "DicomPyramidInstance.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Core/Toolbox.h>
-#include <Plugins/Samples/Common/DicomDatasetReader.h>
-#include <Plugins/Samples/Common/FullOrthancDataset.h>
+#include <Logging.h>
+#include <OrthancException.h>
+#include <Toolbox.h>
+
+#include <DicomDatasetReader.h>
+#include <FullOrthancDataset.h>
+
 #include "../DicomToolbox.h"
 
 #include <cassert>
diff -r ce70678d9a9c -r f299c191cd76 Framework/Inputs/DicomPyramidInstance.h
--- a/Framework/Inputs/DicomPyramidInstance.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Inputs/DicomPyramidInstance.h	Thu Jun 11 07:41:22 2020 +0200
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "../Enumerations.h"
-#include <Plugins/Samples/Common/IOrthancConnection.h>
+#include <IOrthancConnection.h>
 
 #include <boost/noncopyable.hpp>
 #include <vector>
diff -r ce70678d9a9c -r f299c191cd76 Framework/Inputs/DicomPyramidLevel.cpp
--- a/Framework/Inputs/DicomPyramidLevel.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Inputs/DicomPyramidLevel.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,8 +22,8 @@
 #include "../PrecompiledHeadersWSI.h"
 #include "DicomPyramidLevel.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include <Logging.h>
+#include <OrthancException.h>
 
 #include <boost/lexical_cast.hpp>
 
diff -r ce70678d9a9c -r f299c191cd76 Framework/Inputs/HierarchicalTiff.cpp
--- a/Framework/Inputs/HierarchicalTiff.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Inputs/HierarchicalTiff.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,8 +22,8 @@
 #include "../PrecompiledHeadersWSI.h"
 #include "HierarchicalTiff.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include <Logging.h>
+#include <OrthancException.h>
 
 #include <iostream>
 #include <algorithm>
diff -r ce70678d9a9c -r f299c191cd76 Framework/Inputs/ITiledPyramid.h
--- a/Framework/Inputs/ITiledPyramid.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Inputs/ITiledPyramid.h	Thu Jun 11 07:41:22 2020 +0200
@@ -23,7 +23,7 @@
 
 #include "../Enumerations.h"
 
-#include <Core/Images/ImageAccessor.h>
+#include <Images/ImageAccessor.h>
 
 #include <boost/noncopyable.hpp>
 #include <string>
diff -r ce70678d9a9c -r f299c191cd76 Framework/Inputs/OpenSlideLibrary.cpp
--- a/Framework/Inputs/OpenSlideLibrary.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Inputs/OpenSlideLibrary.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,9 +22,9 @@
 #include "../PrecompiledHeadersWSI.h"
 #include "OpenSlideLibrary.h"
 
-#include <Core/Logging.h>
-#include <Core/Images/Image.h>
-#include <Core/OrthancException.h>
+#include <Logging.h>
+#include <Images/Image.h>
+#include <OrthancException.h>
 
 #include <memory>
 
diff -r ce70678d9a9c -r f299c191cd76 Framework/Inputs/OpenSlideLibrary.h
--- a/Framework/Inputs/OpenSlideLibrary.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Inputs/OpenSlideLibrary.h	Thu Jun 11 07:41:22 2020 +0200
@@ -21,8 +21,8 @@
 
 #pragma once
 
-#include <Core/Images/ImageAccessor.h>
-#include <Core/SharedLibrary.h>
+#include <Images/ImageAccessor.h>
+#include <SharedLibrary.h>
 
 #include <vector>
 
diff -r ce70678d9a9c -r f299c191cd76 Framework/Inputs/OpenSlidePyramid.cpp
--- a/Framework/Inputs/OpenSlidePyramid.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Inputs/OpenSlidePyramid.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,9 +22,9 @@
 #include "../PrecompiledHeadersWSI.h"
 #include "OpenSlidePyramid.h"
 
-#include <Core/Images/ImageProcessing.h>
-#include <Core/OrthancException.h>
-#include <Core/Logging.h>
+#include <Images/ImageProcessing.h>
+#include <OrthancException.h>
+#include <Logging.h>
 
 #include <memory>
 
diff -r ce70678d9a9c -r f299c191cd76 Framework/Inputs/SingleLevelDecodedPyramid.cpp
--- a/Framework/Inputs/SingleLevelDecodedPyramid.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Inputs/SingleLevelDecodedPyramid.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -23,7 +23,7 @@
 #include "SingleLevelDecodedPyramid.h"
 #include "../ImageToolbox.h"
 
-#include <Core/OrthancException.h>
+#include <OrthancException.h>
 
 namespace OrthancWSI
 {
diff -r ce70678d9a9c -r f299c191cd76 Framework/Inputs/TiledJpegImage.h
--- a/Framework/Inputs/TiledJpegImage.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Inputs/TiledJpegImage.h	Thu Jun 11 07:41:22 2020 +0200
@@ -23,7 +23,7 @@
 
 #include "SingleLevelDecodedPyramid.h"
 
-#include <Core/Images/JpegReader.h>
+#include <Images/JpegReader.h>
 
 namespace OrthancWSI
 {
diff -r ce70678d9a9c -r f299c191cd76 Framework/Inputs/TiledPngImage.h
--- a/Framework/Inputs/TiledPngImage.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Inputs/TiledPngImage.h	Thu Jun 11 07:41:22 2020 +0200
@@ -23,7 +23,7 @@
 
 #include "SingleLevelDecodedPyramid.h"
 
-#include <Core/Images/PngReader.h>
+#include <Images/PngReader.h>
 
 namespace OrthancWSI
 {
diff -r ce70678d9a9c -r f299c191cd76 Framework/Inputs/TiledPyramidStatistics.cpp
--- a/Framework/Inputs/TiledPyramidStatistics.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Inputs/TiledPyramidStatistics.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,7 +22,7 @@
 #include "../PrecompiledHeadersWSI.h"
 #include "TiledPyramidStatistics.h"
 
-#include <Core/Logging.h>
+#include <Logging.h>
 
 
 namespace OrthancWSI
diff -r ce70678d9a9c -r f299c191cd76 Framework/Jpeg2000Reader.cpp
--- a/Framework/Jpeg2000Reader.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Jpeg2000Reader.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,8 +22,8 @@
 #include "PrecompiledHeadersWSI.h"
 #include "Jpeg2000Reader.h"
 
-#include <Core/OrthancException.h>
-#include <Core/SystemToolbox.h>
+#include <OrthancException.h>
+#include <SystemToolbox.h>
 #include "ImageToolbox.h"
 
 #include <cassert>
diff -r ce70678d9a9c -r f299c191cd76 Framework/Jpeg2000Reader.h
--- a/Framework/Jpeg2000Reader.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Jpeg2000Reader.h	Thu Jun 11 07:41:22 2020 +0200
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <Core/Images/Image.h>
+#include <Images/Image.h>
 #include <memory>
 
 namespace OrthancWSI
diff -r ce70678d9a9c -r f299c191cd76 Framework/Jpeg2000Writer.cpp
--- a/Framework/Jpeg2000Writer.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Jpeg2000Writer.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,8 +22,8 @@
 #include "PrecompiledHeadersWSI.h"
 #include "Jpeg2000Writer.h"
 
-#include <Core/ChunkedBuffer.h>
-#include <Core/OrthancException.h>
+#include <ChunkedBuffer.h>
+#include <OrthancException.h>
 
 #include <openjpeg.h>
 #include <string.h>
diff -r ce70678d9a9c -r f299c191cd76 Framework/Jpeg2000Writer.h
--- a/Framework/Jpeg2000Writer.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Jpeg2000Writer.h	Thu Jun 11 07:41:22 2020 +0200
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <Core/Images/IImageWriter.h>
+#include <Images/IImageWriter.h>
 
 namespace OrthancWSI
 {
diff -r ce70678d9a9c -r f299c191cd76 Framework/MultiThreading/BagOfTasksProcessor.cpp
--- a/Framework/MultiThreading/BagOfTasksProcessor.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/MultiThreading/BagOfTasksProcessor.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -21,8 +21,8 @@
 
 #include "BagOfTasksProcessor.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include <Logging.h>
+#include <OrthancException.h>
 
 #include <stdio.h>
 
diff -r ce70678d9a9c -r f299c191cd76 Framework/MultiThreading/BagOfTasksProcessor.h
--- a/Framework/MultiThreading/BagOfTasksProcessor.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/MultiThreading/BagOfTasksProcessor.h	Thu Jun 11 07:41:22 2020 +0200
@@ -23,7 +23,7 @@
 
 #include "BagOfTasks.h"
 
-#include <Core/MultiThreading/SharedMessageQueue.h>
+#include <MultiThreading/SharedMessageQueue.h>
 
 #include <stdint.h>
 #include <map>
diff -r ce70678d9a9c -r f299c191cd76 Framework/MultiThreading/ICommand.h
--- a/Framework/MultiThreading/ICommand.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/MultiThreading/ICommand.h	Thu Jun 11 07:41:22 2020 +0200
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <Core/IDynamicObject.h>
+#include <IDynamicObject.h>
 
 namespace Orthanc
 {
diff -r ce70678d9a9c -r f299c191cd76 Framework/Outputs/DicomPyramidWriter.cpp
--- a/Framework/Outputs/DicomPyramidWriter.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Outputs/DicomPyramidWriter.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -24,9 +24,9 @@
 
 #include "../DicomToolbox.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Core/DicomParsing/FromDcmtkBridge.h>
+#include <Logging.h>
+#include <OrthancException.h>
+#include <DicomParsing/FromDcmtkBridge.h>
 
 #include <dcmtk/dcmdata/dcdeftag.h>
 #include <boost/lexical_cast.hpp>
diff -r ce70678d9a9c -r f299c191cd76 Framework/Outputs/HierarchicalTiffWriter.cpp
--- a/Framework/Outputs/HierarchicalTiffWriter.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Outputs/HierarchicalTiffWriter.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,9 +22,9 @@
 #include "../PrecompiledHeadersWSI.h"
 #include "HierarchicalTiffWriter.h"
 
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
-#include <Core/TemporaryFile.h>
+#include <Logging.h>
+#include <OrthancException.h>
+#include <TemporaryFile.h>
 
 namespace OrthancWSI
 {
diff -r ce70678d9a9c -r f299c191cd76 Framework/Outputs/IPyramidWriter.h
--- a/Framework/Outputs/IPyramidWriter.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Outputs/IPyramidWriter.h	Thu Jun 11 07:41:22 2020 +0200
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "../Enumerations.h"
-#include <Core/Images/ImageAccessor.h>
+#include <Images/ImageAccessor.h>
 
 #include <boost/noncopyable.hpp>
 
diff -r ce70678d9a9c -r f299c191cd76 Framework/Outputs/InMemoryTiledImage.cpp
--- a/Framework/Outputs/InMemoryTiledImage.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Outputs/InMemoryTiledImage.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -23,8 +23,8 @@
 #include "InMemoryTiledImage.h"
 
 #include "../ImageToolbox.h"
-#include <Core/Logging.h>
-#include <Core/OrthancException.h>
+#include <Logging.h>
+#include <OrthancException.h>
 
 namespace OrthancWSI
 {
diff -r ce70678d9a9c -r f299c191cd76 Framework/Outputs/MultiframeDicomWriter.cpp
--- a/Framework/Outputs/MultiframeDicomWriter.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Outputs/MultiframeDicomWriter.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,8 +22,8 @@
 #include "../PrecompiledHeadersWSI.h"
 #include "MultiframeDicomWriter.h"
 
-#include <Core/OrthancException.h>
-#include <Core/Logging.h>
+#include <OrthancException.h>
+#include <Logging.h>
 #include "../DicomToolbox.h"
 
 #include <dcmtk/dcmdata/dcuid.h>
diff -r ce70678d9a9c -r f299c191cd76 Framework/Outputs/MultiframeDicomWriter.h
--- a/Framework/Outputs/MultiframeDicomWriter.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Outputs/MultiframeDicomWriter.h	Thu Jun 11 07:41:22 2020 +0200
@@ -22,7 +22,7 @@
 #pragma once
 
 #include "../Enumerations.h"
-#include <Core/ChunkedBuffer.h>
+#include <ChunkedBuffer.h>
 
 #include <boost/noncopyable.hpp>
 #include <memory>
diff -r ce70678d9a9c -r f299c191cd76 Framework/Outputs/PyramidWriterBase.cpp
--- a/Framework/Outputs/PyramidWriterBase.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Outputs/PyramidWriterBase.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -23,8 +23,8 @@
 #include "PyramidWriterBase.h"
 
 #include "../ImageToolbox.h"
-#include <Core/OrthancException.h>
-#include <Core/Logging.h>
+#include <OrthancException.h>
+#include <Logging.h>
 
 namespace OrthancWSI
 {
diff -r ce70678d9a9c -r f299c191cd76 Framework/Outputs/TruncatedPyramidWriter.cpp
--- a/Framework/Outputs/TruncatedPyramidWriter.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Outputs/TruncatedPyramidWriter.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,7 +22,7 @@
 #include "../PrecompiledHeadersWSI.h"
 #include "TruncatedPyramidWriter.h"
 
-#include <Core/OrthancException.h>
+#include <OrthancException.h>
 
 namespace OrthancWSI
 {
diff -r ce70678d9a9c -r f299c191cd76 Framework/PrecompiledHeadersWSI.h
--- a/Framework/PrecompiledHeadersWSI.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/PrecompiledHeadersWSI.h	Thu Jun 11 07:41:22 2020 +0200
@@ -23,7 +23,7 @@
 
 #if ORTHANC_USE_PRECOMPILED_HEADERS == 1
 
-#include <Core/PrecompiledHeaders.h>
+#include <PrecompiledHeaders.h>
 
 #include "DicomToolbox.h"
 #include "ImageToolbox.h"
diff -r ce70678d9a9c -r f299c191cd76 Framework/Targets/FolderTarget.cpp
--- a/Framework/Targets/FolderTarget.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Targets/FolderTarget.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -22,8 +22,8 @@
 #include "../PrecompiledHeadersWSI.h"
 #include "FolderTarget.h"
 
-#include <Core/SystemToolbox.h>
-#include <Core/Logging.h>
+#include <SystemToolbox.h>
+#include <Logging.h>
 
 #include <stdio.h>
 
diff -r ce70678d9a9c -r f299c191cd76 Framework/Targets/OrthancTarget.cpp
--- a/Framework/Targets/OrthancTarget.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Targets/OrthancTarget.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -23,9 +23,10 @@
 #include "OrthancTarget.h"
 
 #include "../DicomToolbox.h"
-#include <Core/OrthancException.h>
-#include <Core/Logging.h>
-#include <Plugins/Samples/Common/OrthancHttpConnection.h>
+#include <OrthancException.h>
+#include <Logging.h>
+
+#include <OrthancHttpConnection.h>
 
 namespace OrthancWSI
 {
diff -r ce70678d9a9c -r f299c191cd76 Framework/Targets/OrthancTarget.h
--- a/Framework/Targets/OrthancTarget.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/Framework/Targets/OrthancTarget.h	Thu Jun 11 07:41:22 2020 +0200
@@ -22,8 +22,8 @@
 #pragma once
 
 #include "IFileTarget.h"
-#include <Core/WebServiceParameters.h>
-#include <Plugins/Samples/Common/IOrthancConnection.h>
+#include <WebServiceParameters.h>
+#include <IOrthancConnection.h>
 
 #include <memory>
 
diff -r ce70678d9a9c -r f299c191cd76 ViewerPlugin/CMakeLists.txt
--- a/ViewerPlugin/CMakeLists.txt	Tue Jun 09 07:29:21 2020 +0200
+++ b/ViewerPlugin/CMakeLists.txt	Thu Jun 11 07:41:22 2020 +0200
@@ -41,7 +41,10 @@
 
 include(${ORTHANC_ROOT}/Resources/CMake/VisualStudioPrecompiledHeaders.cmake)
 include(${ORTHANC_ROOT}/Resources/CMake/OrthancFrameworkConfiguration.cmake)
-include_directories(${ORTHANC_ROOT})
+include_directories(
+  ${ORTHANC_ROOT}/Core/
+  ${ORTHANC_ROOT}/Plugins/Samples/Common/
+  )
 
 # Include components specific to WSI
 include(${ORTHANC_WSI_DIR}/Resources/CMake/Version.cmake)
@@ -190,11 +193,11 @@
 #####################################################################
 
 add_library(OrthancWSI SHARED
+  ${ORTHANC_WSI_PCH}
+  ${ORTHANC_WSI_SOURCES}
   ${ORTHANC_CORE_PCH}
   ${ORTHANC_CORE_SOURCES_INTERNAL}
   ${ORTHANC_CORE_SOURCES_DEPENDENCIES}
-  ${ORTHANC_WSI_PCH}
-  ${ORTHANC_WSI_SOURCES}
   ${AUTOGENERATED_SOURCES}
   ${OPENJPEG_SOURCES}
   )
diff -r ce70678d9a9c -r f299c191cd76 ViewerPlugin/DicomPyramidCache.h
--- a/ViewerPlugin/DicomPyramidCache.h	Tue Jun 09 07:29:21 2020 +0200
+++ b/ViewerPlugin/DicomPyramidCache.h	Thu Jun 11 07:41:22 2020 +0200
@@ -23,7 +23,7 @@
 
 #include "../Framework/Inputs/DicomPyramid.h"
 
-#include <Core/Cache/LeastRecentlyUsedIndex.h>
+#include <Cache/LeastRecentlyUsedIndex.h>
 
 #include <boost/thread/mutex.hpp>
 
diff -r ce70678d9a9c -r f299c191cd76 ViewerPlugin/Plugin.cpp
--- a/ViewerPlugin/Plugin.cpp	Tue Jun 09 07:29:21 2020 +0200
+++ b/ViewerPlugin/Plugin.cpp	Thu Jun 11 07:41:22 2020 +0200
@@ -24,14 +24,15 @@
 #include "DicomPyramidCache.h"
 #include "../Framework/Jpeg2000Reader.h"
 
-#include <Core/Logging.h>
-#include <Core/Images/ImageProcessing.h>
-#include <Core/Images/PngWriter.h>
-#include <Core/MultiThreading/Semaphore.h>
-#include <Core/OrthancException.h>
-#include <Core/SystemToolbox.h>
-#include <Plugins/Samples/Common/OrthancPluginCppWrapper.h>
-#include <Plugins/Samples/Common/OrthancPluginConnection.h>
+#include <Logging.h>
+#include <Images/ImageProcessing.h>
+#include <Images/PngWriter.h>
+#include <MultiThreading/Semaphore.h>
+#include <OrthancException.h>
+#include <SystemToolbox.h>
+
+#include <OrthancPluginCppWrapper.h>
+#include <OrthancPluginConnection.h>
 
 #include <EmbeddedResources.h>