# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1630156945 -7200
# Node ID 30ff7a55a71d4c224a55f42e9310f4ed26dae8ff
# Parent  219d05f8d73c84b1a343dbcceaca3f5e318e3b58
cppcheck

diff -r 219d05f8d73c -r 30ff7a55a71d NEWS
--- a/NEWS	Fri Aug 27 15:17:24 2021 +0200
+++ b/NEWS	Sat Aug 28 15:22:25 2021 +0200
@@ -1,4 +1,6 @@
 Pending changes in the mainline
 ===============================
 
+=> Minimum SDK version: 1.4.2 <=
+
 * Initial release
diff -r 219d05f8d73c -r 30ff7a55a71d Plugin/TciaImportJob.cpp
--- a/Plugin/TciaImportJob.cpp	Fri Aug 27 15:17:24 2021 +0200
+++ b/Plugin/TciaImportJob.cpp	Sat Aug 28 15:22:25 2021 +0200
@@ -175,8 +175,8 @@
     static const char* const COLLECTION_NAME = "Collection Name";
     static const char* const SUBJECT_ID = "Subject ID";
     static const char* const SERIES_ID = "Series ID";
-    static const char* const INSTANCES_COUNT = "Number of images";
-    static const char* const SIZE = "File Size (Bytes)";
+    static const char* const NUMBER_OF_IMAGES = "Number of images";
+    static const char* const FILE_SIZE = "File Size (Bytes)";
       
     OrthancPlugins::CsvParser parser;
     parser.Parse(csv);
@@ -187,8 +187,8 @@
     std::map<std::string, size_t>::const_iterator collectionName = index.find(COLLECTION_NAME);
     std::map<std::string, size_t>::const_iterator subjectId = index.find(SUBJECT_ID);
     std::map<std::string, size_t>::const_iterator seriesId = index.find(SERIES_ID);
-    std::map<std::string, size_t>::const_iterator instancesCount = index.find(INSTANCES_COUNT);
-    std::map<std::string, size_t>::const_iterator size = index.find(SIZE);
+    std::map<std::string, size_t>::const_iterator instancesCount = index.find(NUMBER_OF_IMAGES);
+    std::map<std::string, size_t>::const_iterator size = index.find(FILE_SIZE);
 
     if (collectionName == index.end())
     {
@@ -208,12 +208,12 @@
     else if (instancesCount == index.end())
     {
       throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
-                                      "Invalid TCIA cart, missing column: " + std::string(INSTANCES_COUNT));
+                                      "Invalid TCIA cart, missing column: " + std::string(NUMBER_OF_IMAGES));
     }
     else if (size == index.end())
     {
       throw Orthanc::OrthancException(Orthanc::ErrorCode_BadFileFormat,
-                                      "Invalid TCIA cart, missing column: " + std::string(SIZE));
+                                      "Invalid TCIA cart, missing column: " + std::string(FILE_SIZE));
     }
     else
     {
diff -r 219d05f8d73c -r 30ff7a55a71d Plugin/TciaImportJob.h
--- a/Plugin/TciaImportJob.h	Fri Aug 27 15:17:24 2021 +0200
+++ b/Plugin/TciaImportJob.h	Sat Aug 28 15:22:25 2021 +0200
@@ -19,6 +19,8 @@
 
 #pragma once
 
+#include <Compatibility.h>
+
 #include "../Resources/Orthanc/Plugins/OrthancPluginCppWrapper.h"
 
 
diff -r 219d05f8d73c -r 30ff7a55a71d Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Fri Aug 27 15:17:24 2021 +0200
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Sat Aug 28 15:22:25 2021 +0200
@@ -130,6 +130,12 @@
         set(ORTHANC_FRAMEWORK_MD5 "3ea66c09f64aca990016683b6375734e")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.3")
         set(ORTHANC_FRAMEWORK_MD5 "9b86e6f00e03278293cd15643cc0233f")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.4")
+        set(ORTHANC_FRAMEWORK_MD5 "6d5ca4a73ac7d42445041ca79de1624d")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.5")
+        set(ORTHANC_FRAMEWORK_MD5 "10fc64de1254a095e5d3ed3931f0cfbb")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.6")
+        set(ORTHANC_FRAMEWORK_MD5 "4b5d05683d747c29b2860ad79d11e62e")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc