Mercurial > hg > orthanc

changeset 7070:c5e5774720fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Alain Mazy <am@orthanc.team>
date Wed, 12 Aug 2026 11:02:10 +0200
parents ce8dfabee759 (diff) 70385d63b1d7 (current diff)
children 6c78bd3fcded
files
diffstat 11 files changed, 28 insertions(+), 26 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Sources/DataSource/DataSourceAnswer.cpp	Wed Aug 12 10:06:31 2026 +0200
+++ b/OrthancFramework/Sources/DataSource/DataSourceAnswer.cpp	Wed Aug 12 11:02:10 2026 +0200
@@ -54,7 +54,7 @@
   DataSourceAnswer::Item::Item(IDataIdentifier* id /* takes ownership */,
                                const OrthancException& error) :
     id_(id),
-    error_(new OrthancException(error)),
+    error_(new OrthancException(error)),  // NOLINT(bugprone-throw-keyword-missing)
     memorySize_(0)
   {
     if (id == NULL)
--- a/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp	Wed Aug 12 10:06:31 2026 +0200
+++ b/OrthancFramework/Sources/DicomParsing/FromDcmtkBridge.cpp	Wed Aug 12 11:02:10 2026 +0200
@@ -729,7 +729,7 @@
       Uint16*  content_;
 
     public:
-      ValueRepresentationReader_AT(DcmElement& element) :
+      explicit ValueRepresentationReader_AT(DcmElement& element) :
         valid_(false)
       {
         DcmAttributeTag& e = dynamic_cast<DcmAttributeTag&>(element);
@@ -813,7 +813,7 @@
       Float32*  content_;
 
     public:
-      ValueRepresentationReader_OF(DcmElement& element) :
+      explicit ValueRepresentationReader_OF(DcmElement& element) :
         valid_(false)
       {
         /**
@@ -889,7 +889,7 @@
       Float64*  content_;
 
     public:
-      ValueRepresentationReader_OD(DcmElement& element) :
+      explicit ValueRepresentationReader_OD(DcmElement& element) :
         valid_(false)
       {
         /**
@@ -967,7 +967,7 @@
       Uint16*   content_;
 
     public:
-      ValueRepresentationReader_OW(DcmElement& element) :
+      explicit ValueRepresentationReader_OW(DcmElement& element) :
         valid_(false)
       {
         DcmOtherByteOtherWord& e = dynamic_cast<DcmOtherByteOtherWord&>(element);
@@ -1036,7 +1036,7 @@
       Uint32*   content_;
 
     public:
-      ValueRepresentationReader_OL(DcmElement& element) :
+      explicit ValueRepresentationReader_OL(DcmElement& element) :
         valid_(false)
       {
         /**
@@ -1112,7 +1112,7 @@
       Uint64*   content_;
 
     public:
-      ValueRepresentationReader_OV(DcmElement& element) :
+      explicit ValueRepresentationReader_OV(DcmElement& element) :
         valid_(false)
       {
         DcmUnsigned64bitVeryLong& e = dynamic_cast<DcmOther64bitVeryLong&>(element);
@@ -4006,7 +4006,7 @@
             Uint64 f;
             if (content.getUint64(f, i).good())
             {
-              values.push_back(f);
+              values.push_back(static_cast<int64_t>(f));
 
               if (static_cast<Uint64>(values.back()) != f)
               {
--- a/OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.cpp	Wed Aug 12 10:06:31 2026 +0200
+++ b/OrthancFramework/Sources/DicomParsing/Internals/DicomImageDecoder.cpp	Wed Aug 12 11:02:10 2026 +0200
@@ -573,15 +573,13 @@
           throw OrthancException(ErrorCode_NotImplemented, std::string("Palette Color Lookup Table Descriptor not supported: '") + r.c_str() + "'");
         }
 
-        const unsigned int width = target->GetWidth();
-        const unsigned int height = target->GetHeight();
         const uint16_t* source = reinterpret_cast<const uint16_t*>(pixelData + expectedFrameSourceSize * frameToDecode);
         
-        for (unsigned int y = 0; y < height; y++)
+        for (unsigned int y = 0; y < static_cast<unsigned int>(height); y++)
         {
           uint16_t* p = reinterpret_cast<uint16_t*>(target->GetRow(y));
 
-          for (unsigned int x = 0; x < width; x++)
+          for (unsigned int x = 0; x < static_cast<unsigned int>(width); x++)
           {
             p[0] = lutRed[*source];
             p[1] = lutGreen[*source];
--- a/OrthancFramework/Sources/Logging.cpp	Wed Aug 12 10:06:31 2026 +0200
+++ b/OrthancFramework/Sources/Logging.cpp	Wed Aug 12 11:02:10 2026 +0200
@@ -1573,7 +1573,7 @@
             {
               (*it)->HandleLog(level_, category_, pluginName_, file_, line_, messageStream_.str());
             }
-            catch (...)
+            catch (...) // NOLINT(bugprone-empty-catch)
             {
               // Don't throw in destructors
             }
--- a/OrthancFramework/Sources/Logging.h	Wed Aug 12 10:06:31 2026 +0200
+++ b/OrthancFramework/Sources/Logging.h	Wed Aug 12 11:02:10 2026 +0200
@@ -94,7 +94,7 @@
         size_t  count_;
 
       public:
-        ScopedSetter(const ThreadContextMemento& memento);
+        explicit ScopedSetter(const ThreadContextMemento& memento);
 
         ~ScopedSetter();
       };
--- a/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Wed Aug 12 10:06:31 2026 +0200
+++ b/OrthancServer/Plugins/Engine/OrthancPlugins.cpp	Wed Aug 12 11:02:10 2026 +0200
@@ -2581,7 +2581,7 @@
             cgroups_.resize(what.size() - 1);
             for (size_t i = 1; i < what.size(); i++)
             {
-              groups_[i - 1] = what[i];
+              groups_[i - 1] = what[static_cast<int>(i)];
               cgroups_[i - 1] = groups_[i - 1].c_str();
             }
           }
--- a/OrthancServer/Resources/RunCppCheck-2.20.0.sh	Wed Aug 12 10:06:31 2026 +0200
+++ b/OrthancServer/Resources/RunCppCheck-2.20.0.sh	Wed Aug 12 11:02:10 2026 +0200
@@ -14,9 +14,9 @@
 assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:292
 assertWithSideEffect:../../OrthancServer/Sources/Database/Compatibility/DatabaseLookup.cpp:391
 assertWithSideEffect:../../OrthancServer/Sources/ServerJobs/ResourceModificationJob.cpp:287
-constParameterPointer:../../OrthancFramework/Sources/Logging.cpp:450
-constParameterPointer:../../OrthancFramework/Sources/Logging.cpp:454
-constParameterPointer:../../OrthancFramework/Sources/Toolbox.cpp:3351
+constParameterPointer:../../OrthancFramework/Sources/Logging.cpp:452
+constParameterPointer:../../OrthancFramework/Sources/Logging.cpp:456
+constParameterPointer:../../OrthancFramework/Sources/Toolbox.cpp:3467
 missingInclude:../../OrthancServer/Plugins/Engine/OrthancPluginDatabaseV4.cpp:41
 nullPointer:../../OrthancFramework/UnitTestsSources/RestApiTests.cpp:321
 stlFindInsert:../../OrthancFramework/Sources/RestApi/RestApiCallDocumentation.cpp:166
@@ -25,11 +25,17 @@
 syntaxError:../../OrthancFramework/Sources/SQLite/FunctionContext.h
 syntaxError:../../OrthancFramework/UnitTestsSources/DicomMapTests.cpp:74
 syntaxError:../../OrthancServer/UnitTestsSources/UnitTestsMain.cpp:325
-useInitializationList:../../OrthancFramework/Sources/Images/PngReader.cpp:99
+useInitializationList:../../OrthancFramework/Sources/Images/PngReader.cpp:95
 useInitializationList:../../OrthancFramework/Sources/Images/PngWriter.cpp:99
 useInitializationList:../../OrthancServer/Sources/ServerJobs/DicomModalityStoreJob.cpp:280
 variableScope:../../OrthancServer/Sources/OrthancRestApi/OrthancRestApi.cpp:230
-variableScope:../../OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.cpp:97
+variableScope:../../OrthancServer/Sources/ServerJobs/OrthancPeerStoreJob.cpp:98
+sizeofCalculation:../../OrthancFramework/UnitTestsSources/ToolboxTests.cpp:517
+sizeofCalculation:../../OrthancFramework/UnitTestsSources/ToolboxTests.cpp:518
+sizeofCalculation:../../OrthancFramework/UnitTestsSources/ToolboxTests.cpp:519
+sizeofCalculation:../../OrthancFramework/UnitTestsSources/ToolboxTests.cpp:520
+sizeofCalculation:../../OrthancFramework/UnitTestsSources/ToolboxTests.cpp:521
+sizeofCalculation:../../OrthancFramework/UnitTestsSources/ToolboxTests.cpp:522
 EOF
 
 CPPCHECK_BUILD_DIR=/tmp/cppcheck-build-dir-2.20.0/
--- a/OrthancServer/Sources/OrthancConfiguration.cpp	Wed Aug 12 10:06:31 2026 +0200
+++ b/OrthancServer/Sources/OrthancConfiguration.cpp	Wed Aug 12 11:02:10 2026 +0200
@@ -609,8 +609,7 @@
   }
 
 
-  bool OrthancConfiguration::GetIntegerParameter(int& target,
-                                                 const std::string& parameter) const
+  int OrthancConfiguration::GetIntegerParameter(const std::string& parameter) const
   {
     int v;
 
--- a/OrthancServer/Sources/OrthancConfiguration.h	Wed Aug 12 10:06:31 2026 +0200
+++ b/OrthancServer/Sources/OrthancConfiguration.h	Wed Aug 12 11:02:10 2026 +0200
@@ -199,8 +199,7 @@
     bool LookupIntegerParameter(int& target,
                                 const std::string& parameter) const;
 
-    bool GetIntegerParameter(int& target,
-                             const std::string& parameter) const;
+    int GetIntegerParameter(const std::string& parameter) const;
 
     bool LookupUnsignedIntegerParameter(unsigned int& target,
                                         const std::string& parameter) const;
--- a/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp	Wed Aug 12 10:06:31 2026 +0200
+++ b/OrthancServer/Sources/ServerJobs/ArchiveJob.cpp	Wed Aug 12 11:02:10 2026 +0200
@@ -495,7 +495,7 @@
       std::string   filename_;
 
     public:
-      OpenDirectoryCommand(const std::string& filename) :
+      explicit OpenDirectoryCommand(const std::string& filename) :
         filename_(filename)
       {
       }
--- a/OrthancServer/Sources/ServerTranscoder.h	Wed Aug 12 10:06:31 2026 +0200
+++ b/OrthancServer/Sources/ServerTranscoder.h	Wed Aug 12 11:02:10 2026 +0200
@@ -45,7 +45,7 @@
     BuiltinDecoderTranscoderOrder      builtinDecoderTranscoderOrder_;
 
   public:
-    ServerTranscoder(unsigned int maxConcurrentDcmtkTranscoder);
+    explicit ServerTranscoder(unsigned int maxConcurrentDcmtkTranscoder);
 
 #if ORTHANC_ENABLE_PLUGINS == 1
     void SetPlugins(OrthancPlugins& plugins);