Mercurial > hg > orthanc

changeset 4902:df86d2505df8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Orthanc 1.9.8 is now known as Orthanc 1.10.0
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sun, 20 Feb 2022 16:57:43 +0100
parents 0bb73ef7cf07
children 260377d84e9f f2e78f7164d6 f656fb878b50
files OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake OrthancFramework/Sources/DicomFormat/DicomImageInformation.cpp OrthancFramework/Sources/DicomFormat/DicomIntegerPixelAccessor.cpp OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.cpp OrthancServer/Plugins/Engine/OrthancPlugins.cpp OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h OrthancServer/Resources/Configuration.json OrthancServer/Sources/OrthancRestApi/OrthancRestArchive.cpp OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp OrthancServer/Sources/Search/ISqlLookupFormatter.h OrthancServer/Sources/ServerJobs/ArchiveJob.cpp OrthancServer/Sources/ServerJobs/ArchiveJob.h OrthancServer/UnitTestsSources/PluginsTests.cpp
diffstat 13 files changed, 24 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Sun Feb 20 16:35:15 2022 +0100
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Sun Feb 20 16:57:43 2022 +0100
@@ -163,7 +163,7 @@
         # For "Toolbox::ReadJson()" and "Toolbox::Write{...}Json()" (pre-1.9.0)
         set(ORTHANC_FRAMEWORK_MD5 "9af92080e57c60dd288eba46ce606c00")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "b2e08d83e21d")
-        # WSI 1.1 (framework pre-1.9.8), to remove "-std=c++11"
+        # WSI 1.1 (framework pre-1.10.0), to remove "-std=c++11"
         set(ORTHANC_FRAMEWORK_MD5 "2eaa073cbb4b44ffba199ad93393b2b1")
       endif()
     endif()
--- a/OrthancFramework/Sources/DicomFormat/DicomImageInformation.cpp	Sun Feb 20 16:35:15 2022 +0100
+++ b/OrthancFramework/Sources/DicomFormat/DicomImageInformation.cpp	Sun Feb 20 16:57:43 2022 +0100
@@ -187,7 +187,7 @@
 
     if (bitsAllocated_ != 8 && bitsAllocated_ != 16 &&
         bitsAllocated_ != 24 && bitsAllocated_ != 32 &&
-        bitsAllocated_ != 1 /* new in Orthanc 1.9.8 */)
+        bitsAllocated_ != 1 /* new in Orthanc 1.10.0 */)
     {
       throw OrthancException(ErrorCode_IncompatibleImageFormat, "Image not supported: " + boost::lexical_cast<std::string>(bitsAllocated_) + " bits allocated");
     }
@@ -207,7 +207,7 @@
 
     if (bitsStored_ == 1)
     {
-      // This is the case of DICOM SEG, new in Orthanc 1.9.8
+      // This is the case of DICOM SEG, new in Orthanc 1.10.0
       if (bitsAllocated_ != 1)
       {
         throw OrthancException(ErrorCode_BadFileFormat);
@@ -365,7 +365,7 @@
 
       if (GetBitsStored() == 1 && GetChannelCount() == 1 && !IsSigned())
       {
-        // This is the case of DICOM SEG, new in Orthanc 1.9.8
+        // This is the case of DICOM SEG, new in Orthanc 1.10.0
         format = PixelFormat_Grayscale8;
         return true;
       }
--- a/OrthancFramework/Sources/DicomFormat/DicomIntegerPixelAccessor.cpp	Sun Feb 20 16:35:15 2022 +0100
+++ b/OrthancFramework/Sources/DicomFormat/DicomIntegerPixelAccessor.cpp	Sun Feb 20 16:57:43 2022 +0100
@@ -157,7 +157,7 @@
     
     if (information_.GetBitsStored() == 1)
     {
-      // New in Orthanc 1.9.8, notably for DICOM SEG
+      // New in Orthanc 1.10.0, notably for DICOM SEG
       assert(information_.GetBitsAllocated() == 1 &&
              information_.GetChannelCount() == 1 &&
              !information_.IsPlanar());
--- a/OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.cpp	Sun Feb 20 16:35:15 2022 +0100
+++ b/OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.cpp	Sun Feb 20 16:57:43 2022 +0100
@@ -543,7 +543,7 @@
     bool fastVersionSuccess = false;
     PixelFormat sourceFormat;
     if (!info.IsPlanar() &&
-        info.GetBitsStored() != 1 &&  // Black-and-white image, notably DICOM SEG (new in Orthanc 1.9.8)
+        info.GetBitsStored() != 1 &&  // Black-and-white image, notably DICOM SEG (new in Orthanc 1.10.0)
         info.ExtractPixelFormat(sourceFormat, false))
     {
       try
--- a/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Sun Feb 20 16:35:15 2022 +0100
+++ b/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Sun Feb 20 16:57:43 2022 +0100
@@ -1179,8 +1179,8 @@
     IncomingHttpRequestFilters  incomingHttpRequestFilters_;
     IncomingHttpRequestFilters2 incomingHttpRequestFilters2_;
     IncomingDicomInstanceFilters  incomingDicomInstanceFilters_;
-    IncomingCStoreInstanceFilters  incomingCStoreInstanceFilters_;  // New in Orthanc 1.9.8
-    ReceivedInstanceCallbacks  receivedInstanceCallbacks_;  // New in Orthanc 1.9.8
+    IncomingCStoreInstanceFilters  incomingCStoreInstanceFilters_;  // New in Orthanc 1.10.0
+    ReceivedInstanceCallbacks  receivedInstanceCallbacks_;  // New in Orthanc 1.10.0
     RefreshMetricsCallbacks refreshMetricsCallbacks_;
     StorageCommitmentScpCallbacks storageCommitmentScpCallbacks_;
     std::unique_ptr<StorageAreaFactory>  storageArea_;
--- a/OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h	Sun Feb 20 16:35:15 2022 +0100
+++ b/OrthancServer/Plugins/Include/orthanc/OrthancCPlugin.h	Sun Feb 20 16:57:43 2022 +0100
@@ -117,8 +117,8 @@
 #endif
 
 #define ORTHANC_PLUGINS_MINIMAL_MAJOR_NUMBER     1
-#define ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER     9
-#define ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER  2
+#define ORTHANC_PLUGINS_MINIMAL_MINOR_NUMBER     10
+#define ORTHANC_PLUGINS_MINIMAL_REVISION_NUMBER  0
 
 
 #if !defined(ORTHANC_PLUGINS_VERSION_IS_ABOVE)
@@ -462,8 +462,8 @@
     _OrthancPluginService_RegisterIncomingDicomInstanceFilter = 1014,
     _OrthancPluginService_RegisterTranscoderCallback = 1015,   /* New in Orthanc 1.7.0 */
     _OrthancPluginService_RegisterStorageArea2 = 1016,         /* New in Orthanc 1.9.0 */
-    _OrthancPluginService_RegisterIncomingCStoreInstanceFilter = 1017,  /* New in Orthanc 1.9.8 */
-    _OrthancPluginService_RegisterReceivedInstanceCallback = 1018,  /* New in Orthanc 1.9.8 */
+    _OrthancPluginService_RegisterIncomingCStoreInstanceFilter = 1017,  /* New in Orthanc 1.10.0 */
+    _OrthancPluginService_RegisterReceivedInstanceCallback = 1018,  /* New in Orthanc 1.10.0 */
 
     /* Sending answers to REST calls */
     _OrthancPluginService_AnswerBuffer = 2000,
--- a/OrthancServer/Resources/Configuration.json	Sun Feb 20 16:35:15 2022 +0100
+++ b/OrthancServer/Resources/Configuration.json	Sun Feb 20 16:57:43 2022 +0100
@@ -44,7 +44,7 @@
   // Maximum size of the storage cache in MB.  The storage cache
   // is stored in RAM and contains a copy of recently accessed
   // files (written or read).  A value of "0" indicates the cache
-  // is disabled.  (new in Orthanc 1.9.8)
+  // is disabled.  (new in Orthanc 1.10.0)
   "MaximumStorageCacheSize" : 128,
 
   // List of paths to the custom Lua scripts that are to be loaded
@@ -441,7 +441,7 @@
   // connections.  With a single thread, if a C-Find is received
   // during e.g the transcoding of an incoming C-Store, it will
   // have to wait until the end of the C-Store before being processed.
-  // (new in Orthanc 1.9.8, before this version, the value was fixed to 4)
+  // (new in Orthanc 1.10.0, before this version, the value was fixed to 4)
   "DicomThreadsCount" : 4,
 
   // The list of the known Orthanc peers. This option is ignored if
@@ -862,6 +862,6 @@
   // A value of 0 means reading and writing are performed in sequence
   // (default behaviour).  A value > 1 is meaningful only if the storage
   // is a distributed network storage (e.g object storage plugin).
-  // (new in Orthanc 1.9.8)
+  // (new in Orthanc 1.10.0)
   "ZipLoaderThreads": 0
 }
--- a/OrthancServer/Sources/OrthancRestApi/OrthancRestArchive.cpp	Sun Feb 20 16:35:15 2022 +0100
+++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestArchive.cpp	Sun Feb 20 16:57:43 2022 +0100
@@ -146,7 +146,7 @@
 
     {
       OrthancConfiguration::ReaderLock lock;
-      loaderThreads = lock.GetConfiguration().GetUnsignedIntegerParameter(CONFIG_LOADER_THREADS, 0);  // New in Orthanc 1.9.8
+      loaderThreads = lock.GetConfiguration().GetUnsignedIntegerParameter(CONFIG_LOADER_THREADS, 0);  // New in Orthanc 1.10.0
     }
    
   }
@@ -631,7 +631,7 @@
 
     {
       OrthancConfiguration::ReaderLock lock;
-      unsigned int loaderThreads = lock.GetConfiguration().GetUnsignedIntegerParameter(CONFIG_LOADER_THREADS, 0);  // New in Orthanc 1.9.8
+      unsigned int loaderThreads = lock.GetConfiguration().GetUnsignedIntegerParameter(CONFIG_LOADER_THREADS, 0);  // New in Orthanc 1.10.0
       job->SetLoaderThreads(loaderThreads);
     }
 
--- a/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp	Sun Feb 20 16:35:15 2022 +0100
+++ b/OrthancServer/Sources/OrthancRestApi/OrthancRestResources.cpp	Sun Feb 20 16:57:43 2022 +0100
@@ -3677,7 +3677,7 @@
     Register("/instances/{id}/frames/{frame}/matlab", GetMatlabImage);
     Register("/instances/{id}/frames/{frame}/raw", GetRawFrame<false>);
     Register("/instances/{id}/frames/{frame}/raw.gz", GetRawFrame<true>);
-    Register("/instances/{id}/frames/{frame}/numpy", GetNumpyFrame);  // New in Orthanc 1.9.8
+    Register("/instances/{id}/frames/{frame}/numpy", GetNumpyFrame);  // New in Orthanc 1.10.0
     Register("/instances/{id}/pdf", ExtractPdf);
     Register("/instances/{id}/preview", GetImage<ImageExtractionMode_Preview>);
     Register("/instances/{id}/rendered", GetRenderedFrame);
@@ -3686,7 +3686,7 @@
     Register("/instances/{id}/image-int16", GetImage<ImageExtractionMode_Int16>);
     Register("/instances/{id}/matlab", GetMatlabImage);
     Register("/instances/{id}/header", GetInstanceHeader);
-    Register("/instances/{id}/numpy", GetNumpyInstance);  // New in Orthanc 1.9.8
+    Register("/instances/{id}/numpy", GetNumpyInstance);  // New in Orthanc 1.10.0
 
     Register("/patients/{id}/protected", IsProtectedPatient);
     Register("/patients/{id}/protected", SetPatientProtection);
@@ -3746,7 +3746,7 @@
     Register("/instances/{id}/content/*", GetRawContent);
 
     Register("/series/{id}/ordered-slices", OrderSlices);
-    Register("/series/{id}/numpy", GetNumpySeries);  // New in Orthanc 1.9.8
+    Register("/series/{id}/numpy", GetNumpySeries);  // New in Orthanc 1.10.0
 
     Register("/patients/{id}/reconstruct", ReconstructResource<ResourceType_Patient>);
     Register("/studies/{id}/reconstruct", ReconstructResource<ResourceType_Study>);
--- a/OrthancServer/Sources/Search/ISqlLookupFormatter.h	Sun Feb 20 16:35:15 2022 +0100
+++ b/OrthancServer/Sources/Search/ISqlLookupFormatter.h	Sun Feb 20 16:57:43 2022 +0100
@@ -51,7 +51,7 @@
 
     /**
      * Whether to escape '[' and ']', which is only needed for
-     * MSSQL. New in Orthanc 1.9.8, from the following changeset:
+     * MSSQL. New in Orthanc 1.10.0, from the following changeset:
      * https://hg.orthanc-server.com/orthanc-databases/rev/389c037387ea
      **/
     virtual bool IsEscapeBrackets() const = 0;
--- a/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp	Sun Feb 20 16:35:15 2022 +0100
+++ b/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp	Sun Feb 20 16:57:43 2022 +0100
@@ -1194,7 +1194,7 @@
   {
     if (loaderThreads_ == 0)
     {
-      // default behaviour before loaderThreads was introducted in 1.9.8
+      // default behaviour before loaderThreads was introducted in 1.10.0
       instanceLoader_.reset(new SynchronousInstanceLoader(context_));
     }
     else
--- a/OrthancServer/Sources/ServerJobs/ArchiveJob.h	Sun Feb 20 16:35:15 2022 +0100
+++ b/OrthancServer/Sources/ServerJobs/ArchiveJob.h	Sun Feb 20 16:57:43 2022 +0100
@@ -68,7 +68,7 @@
     bool                 transcode_;
     DicomTransferSyntax  transferSyntax_;
 
-    // New in Orthanc 1.9.8
+    // New in Orthanc 1.10.0
     unsigned int         loaderThreads_;
 
     void FinalizeTarget();
--- a/OrthancServer/UnitTestsSources/PluginsTests.cpp	Sun Feb 20 16:35:15 2022 +0100
+++ b/OrthancServer/UnitTestsSources/PluginsTests.cpp	Sun Feb 20 16:57:43 2022 +0100
@@ -77,7 +77,7 @@
   
 #elif defined(__linux__) || defined(__FreeBSD_kernel__)
   /**
-   * Since Orthanc 1.9.8, we test the "libdl.so.2" instead of the
+   * Since Orthanc 1.10.0, we test the "libdl.so.2" instead of the
    * "libdl.so", as discussed here:
    * https://groups.google.com/g/orthanc-users/c/I5g1fN6MCvg/m/JVdvRyjJAAAJ
    * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1001305