# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1479898002 -3600
# Node ID 35febe19e87406c46e0e68c000436d30b85fb07a
# Parent  baf8dd89b4e0f85eb8b917010802afd04348b67d
improved support for sandboxed environments

diff -r baf8dd89b4e0 -r 35febe19e874 Core/Images/JpegReader.cpp
--- a/Core/Images/JpegReader.cpp	Wed Nov 23 11:45:02 2016 +0100
+++ b/Core/Images/JpegReader.cpp	Wed Nov 23 11:46:42 2016 +0100
@@ -36,7 +36,11 @@
 #include "JpegErrorManager.h"
 #include "../OrthancException.h"
 #include "../Logging.h"
-#include "../SystemToolbox.h"
+
+#if ORTHANC_SANDBOXED == 0
+#  include "../SystemToolbox.h"
+#endif
+
 
 namespace Orthanc
 {
diff -r baf8dd89b4e0 -r 35febe19e874 Core/Images/JpegWriter.cpp
--- a/Core/Images/JpegWriter.cpp	Wed Nov 23 11:45:02 2016 +0100
+++ b/Core/Images/JpegWriter.cpp	Wed Nov 23 11:46:42 2016 +0100
@@ -35,9 +35,11 @@
 
 #include "../OrthancException.h"
 #include "../Logging.h"
-#include "../SystemToolbox.h"
+#include "JpegErrorManager.h"
 
-#include "JpegErrorManager.h"
+#if ORTHANC_SANDBOXED == 0
+#  include "../SystemToolbox.h"
+#endif
 
 #include <stdlib.h>
 #include <vector>
diff -r baf8dd89b4e0 -r 35febe19e874 Core/Images/PngReader.cpp
--- a/Core/Images/PngReader.cpp	Wed Nov 23 11:45:02 2016 +0100
+++ b/Core/Images/PngReader.cpp	Wed Nov 23 11:46:42 2016 +0100
@@ -34,9 +34,12 @@
 #include "PngReader.h"
 
 #include "../OrthancException.h"
-#include "../SystemToolbox.h"
 #include "../Toolbox.h"
 
+#if ORTHANC_SANDBOXED == 0
+#  include "../SystemToolbox.h"
+#endif
+
 #include <png.h>
 #include <string.h>  // For memcpy()
 
diff -r baf8dd89b4e0 -r 35febe19e874 Core/Images/PngWriter.cpp
--- a/Core/Images/PngWriter.cpp	Wed Nov 23 11:45:02 2016 +0100
+++ b/Core/Images/PngWriter.cpp	Wed Nov 23 11:46:42 2016 +0100
@@ -39,7 +39,10 @@
 #include "../OrthancException.h"
 #include "../ChunkedBuffer.h"
 #include "../Toolbox.h"
-#include "../SystemToolbox.h"
+
+#if ORTHANC_SANDBOXED == 0
+#  include "../SystemToolbox.h"
+#endif
 
 
 // http://www.libpng.org/pub/png/libpng-1.2.5-manual.html#section-4