# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1559059788 -7200
# Node ID 7608e8107aa1dba2bcc468f9d2184380f6afabda
# Parent  e8fdf29cd0ca8bf1858e12317638100a99578849# Parent  269522196741a7a948be658f11819a452dbe4308
merge

diff -r e8fdf29cd0ca -r 7608e8107aa1 Framework/Deprecated/Toolbox/ISeriesLoader.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Framework/Deprecated/Toolbox/ISeriesLoader.h	Tue May 28 18:09:48 2019 +0200
@@ -0,0 +1,59 @@
+/**
+ * Stone of Orthanc
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * 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
+ * Affero General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ **/
+
+
+#pragma once
+
+#include "ParallelSlices.h"
+
+#include <Images/ImageAccessor.h>
+#include <Plugins/Samples/Common/IDicomDataset.h>
+
+namespace Deprecated
+{
+  class ISeriesLoader : public boost::noncopyable
+  {
+  public:
+    virtual ~ISeriesLoader()
+    {
+    }
+    
+    virtual ParallelSlices& GetGeometry() = 0;
+
+    virtual Orthanc::PixelFormat GetPixelFormat() = 0;
+
+    virtual unsigned int GetWidth() = 0;
+
+    virtual unsigned int GetHeight() = 0;
+
+    virtual OrthancPlugins::IDicomDataset* DownloadDicom(size_t index) = 0;
+
+    // This downloads the frame from Orthanc. The resulting pixel
+    // format must be Grayscale8, Grayscale16, SignedGrayscale16 or
+    // RGB24. Orthanc Stone assumes the conversion of the photometric
+    // interpretation is done by Orthanc.
+    virtual Orthanc::ImageAccessor* DownloadFrame(size_t index) = 0;
+
+    virtual Orthanc::ImageAccessor* DownloadJpegFrame(size_t index,
+                                                      unsigned int quality) = 0;
+
+    virtual bool IsJpegAvailable() = 0;
+  };
+}
diff -r e8fdf29cd0ca -r 7608e8107aa1 Framework/Toolbox/ISeriesLoader.h
--- a/Framework/Toolbox/ISeriesLoader.h	Tue May 28 18:09:26 2019 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/**
- * Stone of Orthanc
- * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
- * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2019 Osimis S.A., Belgium
- *
- * This program is free software: you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.
- *
- * 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
- * Affero General Public License for more details.
- * 
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- **/
-
-
-#pragma once
-
-#include "ParallelSlices.h"
-
-#include <Images/ImageAccessor.h>
-#include <Plugins/Samples/Common/IDicomDataset.h>
-
-namespace OrthancStone
-{
-  class ISeriesLoader : public boost::noncopyable
-  {
-  public:
-    virtual ~ISeriesLoader()
-    {
-    }
-    
-    virtual ParallelSlices& GetGeometry() = 0;
-
-    virtual Orthanc::PixelFormat GetPixelFormat() = 0;
-
-    virtual unsigned int GetWidth() = 0;
-
-    virtual unsigned int GetHeight() = 0;
-
-    virtual OrthancPlugins::IDicomDataset* DownloadDicom(size_t index) = 0;
-
-    // This downloads the frame from Orthanc. The resulting pixel
-    // format must be Grayscale8, Grayscale16, SignedGrayscale16 or
-    // RGB24. Orthanc Stone assumes the conversion of the photometric
-    // interpretation is done by Orthanc.
-    virtual Orthanc::ImageAccessor* DownloadFrame(size_t index) = 0;
-
-    virtual Orthanc::ImageAccessor* DownloadJpegFrame(size_t index,
-                                                      unsigned int quality) = 0;
-
-    virtual bool IsJpegAvailable() = 0;
-  };
-}