# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1544436931 -3600
# Node ID 9cc3d40e389bb196667bf3acd3657e909dde7158
# Parent  96089d1aba4d50ee8e94aa761c29e874b4a74e9d
Orthanc 1.4.3 is now known as 1.5.0

diff -r 96089d1aba4d -r 9cc3d40e389b Core/OrthancException.h
--- a/Core/OrthancException.h	Mon Dec 10 10:33:58 2018 +0100
+++ b/Core/OrthancException.h	Mon Dec 10 11:15:31 2018 +0100
@@ -52,7 +52,7 @@
     ErrorCode  errorCode_;
     HttpStatus httpStatus_;
 
-    // New in Orthanc 1.4.3
+    // New in Orthanc 1.5.0
     std::auto_ptr<std::string>  details_;
     
   public:
diff -r 96089d1aba4d -r 9cc3d40e389b OrthancServer/OrthancRestApi/OrthancRestModalities.cpp
--- a/OrthancServer/OrthancRestApi/OrthancRestModalities.cpp	Mon Dec 10 10:33:58 2018 +0100
+++ b/OrthancServer/OrthancRestApi/OrthancRestModalities.cpp	Mon Dec 10 11:15:31 2018 +0100
@@ -540,7 +540,7 @@
     {
       if (expand)
       {
-        // New in Orthanc 1.4.3
+        // New in Orthanc 1.5.0
         DicomMap value;
         query.GetHandler().GetAnswer(value, i);
         
@@ -710,7 +710,7 @@
   template <ResourceType CHILDREN_LEVEL>
   static void QueryAnswerChildren(RestApiPostCall& call)
   {
-    // New in Orthanc 1.4.3
+    // New in Orthanc 1.5.0
     assert(CHILDREN_LEVEL == ResourceType_Study ||
            CHILDREN_LEVEL == ResourceType_Series ||
            CHILDREN_LEVEL == ResourceType_Instance);
diff -r 96089d1aba4d -r 9cc3d40e389b OrthancServer/ServerEnumerations.h
--- a/OrthancServer/ServerEnumerations.h	Mon Dec 10 10:33:58 2018 +0100
+++ b/OrthancServer/ServerEnumerations.h	Mon Dec 10 11:15:31 2018 +0100
@@ -93,10 +93,10 @@
     GlobalProperty_FlushSleep = 2,
     GlobalProperty_AnonymizationSequence = 3,
     GlobalProperty_JobsRegistry = 5,
-    GlobalProperty_TotalCompressedSize = 6,     // Reserved for Orthanc > 1.4.3
-    GlobalProperty_TotalUncompressedSize = 7,   // Reserved for Orthanc > 1.4.3
-    GlobalProperty_Modalities = 20,             // New in Orthanc 1.4.3
-    GlobalProperty_Peers = 21,                  // New in Orthanc 1.4.3
+    GlobalProperty_TotalCompressedSize = 6,     // Reserved for Orthanc > 1.5.0
+    GlobalProperty_TotalUncompressedSize = 7,   // Reserved for Orthanc > 1.5.0
+    GlobalProperty_Modalities = 20,             // New in Orthanc 1.5.0
+    GlobalProperty_Peers = 21,                  // New in Orthanc 1.5.0
 
     // Reserved values for internal use by the database plugins
     GlobalProperty_DatabasePatchLevel = 4,
diff -r 96089d1aba4d -r 9cc3d40e389b Plugins/Include/orthanc/OrthancCPlugin.h
--- a/Plugins/Include/orthanc/OrthancCPlugin.h	Mon Dec 10 10:33:58 2018 +0100
+++ b/Plugins/Include/orthanc/OrthancCPlugin.h	Mon Dec 10 11:15:31 2018 +0100
@@ -118,8 +118,8 @@
 #endif
 
 #define ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER     1
-#define ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER     4
-#define ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER  3
+#define ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER     5
+#define ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER  0
 
 
 #if !defined(ORTHANC_PLUGINS_VERSION_IS_ABOVE)
diff -r 96089d1aba4d -r 9cc3d40e389b Plugins/Samples/Common/OrthancPluginCppWrapper.cpp
--- a/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp	Mon Dec 10 10:33:58 2018 +0100
+++ b/Plugins/Samples/Common/OrthancPluginCppWrapper.cpp	Mon Dec 10 11:15:31 2018 +0100
@@ -1357,7 +1357,7 @@
   }
 
   
-#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 4, 3)
+#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 5, 0)
   const char* AutodetectMimeType(const std::string& path)
   {
     const char* mime = OrthancPluginAutodetectMimeType(GetGlobalContext(), path.c_str());
diff -r 96089d1aba4d -r 9cc3d40e389b Plugins/Samples/Common/OrthancPluginCppWrapper.h
--- a/Plugins/Samples/Common/OrthancPluginCppWrapper.h	Mon Dec 10 10:33:58 2018 +0100
+++ b/Plugins/Samples/Common/OrthancPluginCppWrapper.h	Mon Dec 10 11:15:31 2018 +0100
@@ -71,7 +71,7 @@
 #  define HAS_ORTHANC_PLUGIN_JOB    0
 #endif
 
-#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 4, 3)
+#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 5, 0)
 #  define HAS_ORTHANC_PLUGIN_EXCEPTION_DETAILS  1
 #else
 #  define HAS_ORTHANC_PLUGIN_EXCEPTION_DETAILS  0
@@ -492,7 +492,7 @@
 
   void AnswerMethodNotAllowed(OrthancPluginRestOutput* output, const char* allowedMethods);
 
-#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 4, 3)
+#if ORTHANC_PLUGINS_VERSION_IS_ABOVE(1, 5, 0)
   const char* AutodetectMimeType(const std::string& path);
 #endif
 
diff -r 96089d1aba4d -r 9cc3d40e389b Resources/CMake/BoostConfiguration.cmake
--- a/Resources/CMake/BoostConfiguration.cmake	Mon Dec 10 10:33:58 2018 +0100
+++ b/Resources/CMake/BoostConfiguration.cmake	Mon Dec 10 11:15:31 2018 +0100
@@ -55,8 +55,8 @@
   
   set(BOOST_NAME boost_1_68_0)
   set(BOOST_VERSION 1.68.0)
-  set(BOOST_BCP_SUFFIX bcpdigest-1.4.3)
-  set(BOOST_MD5 "2d272566a72343766c523e2e32313c65")
+  set(BOOST_BCP_SUFFIX bcpdigest-1.5.0)
+  set(BOOST_MD5 "5297c45ffda809b2da84223bac591abe")
   set(BOOST_URL "http://www.orthanc-server.com/downloads/third-party/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz")
   set(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME})
 
diff -r 96089d1aba4d -r 9cc3d40e389b Resources/CMake/BoostConfiguration.sh
--- a/Resources/CMake/BoostConfiguration.sh	Mon Dec 10 10:33:58 2018 +0100
+++ b/Resources/CMake/BoostConfiguration.sh	Mon Dec 10 11:15:31 2018 +0100
@@ -20,10 +20,10 @@
 ##   - Orthanc 1.3.1: Boost 1.65.1
 ##   - Orthanc 1.3.2: Boost 1.66.0
 ##   - Orthanc between 1.4.0 and 1.4.2: Boost 1.67.0
-##   - Orthanc >= 1.4.3: Boost 1.68.0
+##   - Orthanc >= 1.5.0: Boost 1.68.0
 
 BOOST_VERSION=1_68_0
-ORTHANC_VERSION=1.4.3
+ORTHANC_VERSION=1.5.0
 
 rm -rf /tmp/boost_${BOOST_VERSION}
 rm -rf /tmp/bcp/boost_${BOOST_VERSION}
diff -r 96089d1aba4d -r 9cc3d40e389b Resources/CMake/OrthancFrameworkConfiguration.cmake
--- a/Resources/CMake/OrthancFrameworkConfiguration.cmake	Mon Dec 10 10:33:58 2018 +0100
+++ b/Resources/CMake/OrthancFrameworkConfiguration.cmake	Mon Dec 10 11:15:31 2018 +0100
@@ -562,6 +562,34 @@
 endif()
 
 
+
+#####################################################################
+## Configuration of Orthanc versioning macros (new in Orthanc 1.5.0)
+#####################################################################
+
+if (ORTHANC_VERSION STREQUAL "mainline")
+  set(ORTHANC_VERSION_MAJOR "999")
+  set(ORTHANC_VERSION_MINOR "999")
+  set(ORTHANC_VERSION_REVISION "999")
+else()
+  string(REGEX REPLACE "^([0-9]*)\\.([0-9]*)\\.([0-9]*)$" "\\1" ORTHANC_VERSION_MAJOR    ${ORTHANC_VERSION})
+  string(REGEX REPLACE "^([0-9]*)\\.([0-9]*)\\.([0-9]*)$" "\\2" ORTHANC_VERSION_MINOR    ${ORTHANC_VERSION})
+  string(REGEX REPLACE "^([0-9]*)\\.([0-9]*)\\.([0-9]*)$" "\\3" ORTHANC_VERSION_REVISION ${ORTHANC_VERSION})
+
+  if (NOT ORTHANC_VERSION STREQUAL
+      "${ORTHANC_VERSION_MAJOR}.${ORTHANC_VERSION_MINOR}.${ORTHANC_VERSION_REVISION}")
+    message(FATAL_ERROR "Error in the (x.y.z) format of the Orthanc version: ${ORTHANC_VERSION}")
+  endif()
+endif()
+
+add_definitions(
+  -DORTHANC_VERSION_MAJOR=${ORTHANC_VERSION_MAJOR}
+  -DORTHANC_VERSION_MINOR=${ORTHANC_VERSION_MINOR}
+  -DORTHANC_VERSION_REVISION=${ORTHANC_VERSION_REVISION}
+  )
+
+
+
 #####################################################################
 ## Gathering of all the source code
 #####################################################################
diff -r 96089d1aba4d -r 9cc3d40e389b Resources/Configuration.json
--- a/Resources/Configuration.json	Mon Dec 10 10:33:58 2018 +0100
+++ b/Resources/Configuration.json	Mon Dec 10 11:15:31 2018 +0100
@@ -183,7 +183,7 @@
     /**
      * By default, the Orthanc SCP accepts all DICOM commands (C-GET,
      * C-STORE, C-FIND, C-MOVE) issued by the remote SCU
-     * modalities. Starting with Orthanc 1.4.3, it is possible to
+     * modalities. Starting with Orthanc 1.5.0, it is possible to
      * specify which DICOM commands are allowed, separately for each
      * remote modality, using the syntax below.
      **/
@@ -199,7 +199,7 @@
   },
 
   // Whether to store the DICOM modalities in the Orthanc database
-  // instead of in this configuration file (new in Orthanc 1.4.3)
+  // instead of in this configuration file (new in Orthanc 1.5.0)
   "DicomModalitiesInDatabase" : false,
 
   // Whether the Orthanc SCP allows incoming C-Echo requests, even
@@ -253,7 +253,7 @@
   },
 
   // Whether to store the Orthanc peers in the Orthanc database
-  // instead of in this configuration file (new in Orthanc 1.4.3)
+  // instead of in this configuration file (new in Orthanc 1.5.0)
   "OrthancPeersInDatabase" : false,
 
   // Parameters of the HTTP proxy to be used by Orthanc. If set to the
@@ -424,13 +424,13 @@
   // creating a new background job. Up to Orthanc 1.3.2, the implicit
   // behavior was to use synchronous C-Move. Between Orthanc 1.4.0 and
   // 1.4.2, the default behavior was set to asynchronous C-Move. Since
-  // Orthanc 1.4.3, the default behavior is synchronous C-Move
+  // Orthanc 1.5.0, the default behavior is synchronous C-Move
   // (backward compatibility with Orthanc <= 1.3.2).
   "SynchronousCMove" : true,
 
   // Maximum number of completed jobs that are kept in memory. A
   // processing job is considered as complete once it is tagged as
-  // "Success" or "Failure". Since Orthanc 1.4.3, a value of "0"
+  // "Success" or "Failure". Since Orthanc 1.5.0, a value of "0"
   // indicates to keep no job in memory (i.e. jobs are removed from
   // the history as soon as they are completed).
   "JobsHistorySize" : 10,
@@ -445,7 +445,7 @@
   // Maximum number of ZIP/media archives that are maintained by
   // Orthanc, as a response to the asynchronous creation of archives.
   // The least recently used archives get deleted as new archives are
-  // generated. This option was introduced in Orthanc 1.4.3, and has
+  // generated. This option was introduced in Orthanc 1.5.0, and has
   // no effect on the synchronous generation of archives.
   "MediaArchiveSize" : 1
 }
diff -r 96089d1aba4d -r 9cc3d40e389b Resources/WindowsResources.rc
--- a/Resources/WindowsResources.rc	Mon Dec 10 10:33:58 2018 +0100
+++ b/Resources/WindowsResources.rc	Mon Dec 10 11:15:31 2018 +0100
@@ -11,11 +11,11 @@
          BLOCK "${BLOCK}"
          BEGIN
             VALUE "Comments", "${RELEASE}"
-            VALUE "CompanyName", "University Hospital of Liege, Belgium"
+            VALUE "CompanyName", "Osimis SA, Belgium"
             VALUE "FileDescription", "${DESCRIPTION}"
             VALUE "FileVersion", "${VERSION_MAJOR}.${VERSION_MINOR}.0.${VERSION_PATCH}"
             VALUE "InternalName", "${PRODUCT}"
-            VALUE "LegalCopyright", "(c) 2012-${YEAR}, Sebastien Jodogne, University Hospital of Liege, Belgium"
+            VALUE "LegalCopyright", "(c) 2012-${YEAR}, Sebastien Jodogne, University Hospital of Liege, and Osimis SA, Belgium"
             VALUE "LegalTrademarks", "Licensing information is available at http://www.orthanc-server.com/"
             VALUE "OriginalFilename", "${FILENAME}"
             VALUE "ProductName", "${PRODUCT}"