Mercurial > hg > orthanc

changeset 5347:4f686f6150c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <am@osimis.io>
date Thu, 29 Jun 2023 09:43:41 +0200
parents 566e8d32bd3a (current diff) 34781fb0172a (diff)
children 303e930fff0f
files
diffstat 5 files changed, 13 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/HttpServer/HttpContentNegociation.cpp	Thu Jun 29 09:43:20 2023 +0200
+++ b/OrthancFramework/Sources/HttpServer/HttpContentNegociation.cpp	Thu Jun 29 09:43:41 2023 +0200
@@ -231,7 +231,6 @@
     Toolbox::TokenizeString(mediaRanges, accept, ',');
 
     std::unique_ptr<Reference> bestMatch;
-    Dictionary bestParameters;
 
     for (Tokens::const_iterator it = mediaRanges.begin();
          it != mediaRanges.end(); ++it)
--- a/OrthancFramework/Sources/MetricsRegistry.cpp	Thu Jun 29 09:43:20 2023 +0200
+++ b/OrthancFramework/Sources/MetricsRegistry.cpp	Thu Jun 29 09:43:41 2023 +0200
@@ -186,7 +186,7 @@
     MetricsUpdatePolicy   policy_;
     
   public:
-    Item(MetricsUpdatePolicy policy) :
+    explicit Item(MetricsUpdatePolicy policy) :
       policy_(policy)
     {
     }
@@ -222,7 +222,7 @@
     TimestampedValue<float>  value_;
 
   public:
-    FloatItem(MetricsUpdatePolicy policy) :
+    explicit FloatItem(MetricsUpdatePolicy policy) :
       Item(policy)
     {
     }
@@ -270,7 +270,7 @@
     TimestampedValue<int64_t>  value_;
 
   public:
-    IntegerItem(MetricsUpdatePolicy policy) :
+    explicit IntegerItem(MetricsUpdatePolicy policy) :
       Item(policy)
     {
     }
--- a/OrthancServer/Plugins/Samples/Basic/Plugin.c	Thu Jun 29 09:43:20 2023 +0200
+++ b/OrthancServer/Plugins/Samples/Basic/Plugin.c	Thu Jun 29 09:43:41 2023 +0200
@@ -293,6 +293,9 @@
   else
   {
     OrthancPluginLoadDicomInstanceMode mode = OrthancPluginLoadDicomInstanceMode_WholeDicom;
+    OrthancPluginDicomInstance* instance;
+    char* json;
+
     if (request->getCount == 1)
     {
       if (strcmp(request->getKeys[0], "until-pixel-data") == 0)
@@ -309,16 +312,16 @@
       }
     }
     
-    OrthancPluginDicomInstance* instance = OrthancPluginLoadDicomInstance(context, request->groups[0], mode);
+    instance = OrthancPluginLoadDicomInstance(context, request->groups[0], mode);
     if (instance == NULL)
     {
       return OrthancPluginErrorCode_UnknownResource;
     }
 
-    char* json = OrthancPluginEncodeDicomWebXml(context,
-                                                OrthancPluginGetInstanceData(context, instance),
-                                                OrthancPluginGetInstanceSize(context, instance),
-                                                DicomWebBinaryCallback);
+    json = OrthancPluginEncodeDicomWebXml(context,
+                                          OrthancPluginGetInstanceData(context, instance),
+                                          OrthancPluginGetInstanceSize(context, instance),
+                                          DicomWebBinaryCallback);
     OrthancPluginFreeDicomInstance(context, instance);
 
     if (json != NULL)
--- a/OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp	Thu Jun 29 09:43:20 2023 +0200
+++ b/OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp	Thu Jun 29 09:43:41 2023 +0200
@@ -222,7 +222,7 @@
     catch (OrthancException& e)
     {
       LOG(WARNING) << "An error occurred while executing a Modification job on instance " << instance << ": " << e.GetDetails();
-      throw e;
+      throw;
     }
 
 
--- a/OrthancServer/UnitTestsSources/VersionsTests.cpp	Thu Jun 29 09:43:20 2023 +0200
+++ b/OrthancServer/UnitTestsSources/VersionsTests.cpp	Thu Jun 29 09:43:41 2023 +0200
@@ -112,7 +112,7 @@
 
 TEST(Versions, BoostStatic)
 {
-  ASSERT_TRUE(std::string(BOOST_LIB_VERSION) == "1_80" ||
+  ASSERT_TRUE(std::string(BOOST_LIB_VERSION) == "1_82" ||
               std::string(BOOST_LIB_VERSION) == "1_69" /* if USE_LEGACY_BOOST */);
 }