# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1473345133 -7200
# Node ID bfeacb51af20d85a8d777a48d852766826311b47
# Parent  d2a0c41869ab1bf04aa699b3dea7b77c34b2e7d1
cleaning up code

diff -r d2a0c41869ab -r bfeacb51af20 CMakeLists.txt
--- a/CMakeLists.txt	Thu Sep 08 16:27:22 2016 +0200
+++ b/CMakeLists.txt	Thu Sep 08 16:32:13 2016 +0200
@@ -130,6 +130,7 @@
   Core/MultiThreading/SharedMessageQueue.cpp
   Core/Images/Font.cpp
   Core/Images/FontRegistry.cpp
+  Core/Images/IImageWriter.cpp
   Core/Images/ImageAccessor.cpp
   Core/Images/ImageBuffer.cpp
   Core/Images/ImageProcessing.cpp
diff -r d2a0c41869ab -r bfeacb51af20 Core/Images/IImageWriter.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Core/Images/IImageWriter.cpp	Thu Sep 08 16:32:13 2016 +0200
@@ -0,0 +1,55 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * In addition, as a special exception, the copyright holders of this
+ * program give permission to link the code of its release with the
+ * OpenSSL project's "OpenSSL" library (or with modified versions of it
+ * that use the same license as the "OpenSSL" library), and distribute
+ * the linked executables. You must obey the GNU General Public License
+ * in all respects for all of the code used other than "OpenSSL". If you
+ * modify file(s) with this exception, you may extend this exception to
+ * your version of the file(s), but you are not obligated to do so. If
+ * you do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source files
+ * in the program, then also delete it here.
+ * 
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#include "IImageWriter.h"
+
+#include "../OrthancException.h"
+#include "../Toolbox.h"
+
+namespace Orthanc
+{
+  void IImageWriter::WriteToFileInternal(const std::string& path,
+                                         unsigned int width,
+                                         unsigned int height,
+                                         unsigned int pitch,
+                                         PixelFormat format,
+                                         const void* buffer)
+  {
+#if !defined(ORTHANC_SANDBOXED) || ORTHANC_SANDBOXED != 1
+    std::string compressed;
+    WriteToMemoryInternal(compressed, width, height, pitch, format, buffer);
+    Toolbox::WriteFile(compressed, path);
+#else
+    throw OrthancException(ErrorCode_CannotWriteFile);  // Unavailable in sandboxed environments
+#endif
+  }
+}
diff -r d2a0c41869ab -r bfeacb51af20 Core/Images/IImageWriter.h
--- a/Core/Images/IImageWriter.h	Thu Sep 08 16:27:22 2016 +0200
+++ b/Core/Images/IImageWriter.h	Thu Sep 08 16:32:13 2016 +0200
@@ -33,7 +33,6 @@
 #pragma once
 
 #include "ImageAccessor.h"
-#include "../Toolbox.h"
 
 #include <boost/noncopyable.hpp>
 
@@ -54,16 +53,7 @@
                                      unsigned int height,
                                      unsigned int pitch,
                                      PixelFormat format,
-                                     const void* buffer)
-    {
-#if !defined(ORTHANC_SANDBOXED) || ORTHANC_SANDBOXED != 1
-     std::string compressed;
-      WriteToMemoryInternal(compressed, width, height, pitch, format, buffer);
-      Toolbox::WriteFile(compressed, path);
-#else
-      throw OrthancException(ErrorCode_CannotWriteFile);  // Unavailable in sandboxed environments
-#endif
-    }
+                                     const void* buffer);
 
   public:
     virtual ~IImageWriter()
diff -r d2a0c41869ab -r bfeacb51af20 Core/Images/JpegWriter.cpp
--- a/Core/Images/JpegWriter.cpp	Thu Sep 08 16:27:22 2016 +0200
+++ b/Core/Images/JpegWriter.cpp	Thu Sep 08 16:32:13 2016 +0200
@@ -35,6 +35,7 @@
 
 #include "../OrthancException.h"
 #include "../Logging.h"
+#include "../Toolbox.h"
 
 #include "JpegErrorManager.h"