Mercurial > hg > orthanc-dicomweb

changeset 474:907aeac6ce89

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sync, cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 17 Oct 2020 18:43:45 +0200
parents c09f5b6e53dd
children b7a495d2b39e
files Plugin/DicomWebClient.cpp Plugin/QidoRs.cpp Plugin/StowRs.cpp Plugin/StowRs.h Plugin/WadoRsRetrieveFrames.cpp Resources/Orthanc/CMake/DownloadOrthancFramework.cmake Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake Resources/RunCppCheck.sh
diffstat 8 files changed, 80 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/Plugin/DicomWebClient.cpp	Wed Aug 26 13:22:47 2020 +0200
+++ b/Plugin/DicomWebClient.cpp	Sat Oct 17 18:43:45 2020 +0200
@@ -179,10 +179,10 @@
   {
     assert(job != NULL && factory != NULL);
 
-    JobContext context(*job);
-
     try
     {
+      JobContext context(*job);
+
       std::unique_ptr<IFunction> function(factory->CreateFunction());
       function->Execute(context);
 
@@ -768,21 +768,21 @@
   };
   
 
-  virtual void CancelFunction()
+  virtual void CancelFunction() ORTHANC_OVERRIDE
   {
     boost::mutex::scoped_lock lock(mutex_);
     action_ = Action_Cancel;
   }
   
 
-  virtual void PauseFunction()
+  virtual void PauseFunction() ORTHANC_OVERRIDE
   {
     boost::mutex::scoped_lock lock(mutex_);
     action_ = Action_Pause;
   }
 
   
-  virtual IFunction* CreateFunction()
+  virtual IFunction* CreateFunction() ORTHANC_OVERRIDE
   {
     action_ = Action_None;
     return new F(*this);
@@ -1014,7 +1014,7 @@
 
   virtual void HandlePart(const Orthanc::MultipartStreamReader::HttpHeaders& headers,
                           const void* part,
-                          size_t size)
+                          size_t size) ORTHANC_OVERRIDE
   {
     std::string contentType;
     if (!Orthanc::MultipartStreamReader::GetMainContentType(contentType, headers))
@@ -1088,7 +1088,7 @@
   }
 
   virtual void AddHeader(const std::string& key,
-                         const std::string& value)
+                         const std::string& value) ORTHANC_OVERRIDE
   {
     boost::mutex::scoped_lock lock(mutex_);
 
@@ -1137,7 +1137,7 @@
   }
 
   virtual void AddChunk(const void* data,
-                        size_t size)
+                        size_t size) ORTHANC_OVERRIDE
   {
     boost::mutex::scoped_lock lock(mutex_);
 
@@ -1373,7 +1373,7 @@
   }
 
 
-  virtual void CancelFunction()
+  virtual void CancelFunction() ORTHANC_OVERRIDE
   {
     boost::mutex::scoped_lock lock(mutex_);
 
@@ -1384,13 +1384,13 @@
     }
   }
 
-  virtual void PauseFunction()
+  virtual void PauseFunction() ORTHANC_OVERRIDE
   {
     // This type of job cannot be paused
     CancelFunction();
   }
 
-  virtual IFunction* CreateFunction()
+  virtual IFunction* CreateFunction() ORTHANC_OVERRIDE
   {
     // This type of job cannot be paused: If restarting, always go
     // back to the beginning
--- a/Plugin/QidoRs.cpp	Wed Aug 26 13:22:47 2020 +0200
+++ b/Plugin/QidoRs.cpp	Sat Oct 17 18:43:45 2020 +0200
@@ -169,10 +169,10 @@
             std::vector<std::string> tags;
             Orthanc::Toolbox::TokenizeString(tags, value, ',');
             
-            for (size_t i = 0; i < tags.size(); i++)
+            for (size_t j = 0; j < tags.size(); j++)
             {
               Orthanc::DicomTag tag(0, 0);
-              if (OrthancPlugins::ParseTag(tag, tags[i]))
+              if (OrthancPlugins::ParseTag(tag, tags[j]))
               {
                 includeFields_.push_back(tag);
               }
@@ -525,12 +525,6 @@
       Orthanc::DicomMap source;
       source.FromDicomAsJson(tags);
 
-      std::string wadoUrl = OrthancPlugins::Configuration::GetWadoUrl(
-        wadoBase,
-        source.GetStringValue(Orthanc::DICOM_TAG_STUDY_INSTANCE_UID, "", false),
-        source.GetStringValue(Orthanc::DICOM_TAG_SERIES_INSTANCE_UID, "", false),
-        source.GetStringValue(Orthanc::DICOM_TAG_SOP_INSTANCE_UID, "", false));
-
       Orthanc::DicomMap target;
       target.Assign(derivedTags);
       matcher.ExtractFields(target, source, wadoBase, level);
--- a/Plugin/StowRs.cpp	Wed Aug 26 13:22:47 2020 +0200
+++ b/Plugin/StowRs.cpp	Sat Oct 17 18:43:45 2020 +0200
@@ -149,7 +149,7 @@
       }
 
       MemoryBuffer tmp;
-      bool ok = tmp.RestApiPost("/instances", part, size, false);
+      ok = tmp.RestApiPost("/instances", part, size, false);
       tmp.Clear();
 
       if (ok)
--- a/Plugin/StowRs.h	Wed Aug 26 13:22:47 2020 +0200
+++ b/Plugin/StowRs.h	Sat Oct 17 18:43:45 2020 +0200
@@ -46,7 +46,7 @@
 
     virtual void HandlePart(const Orthanc::MultipartStreamReader::HttpHeaders& headers,
                             const void* part,
-                            size_t size);
+                            size_t size) ORTHANC_OVERRIDE;
 
   public:
     StowServer(OrthancPluginContext* context,
@@ -54,9 +54,9 @@
                const std::string& expectedStudy);
 
     virtual void AddChunk(const void* data,
-                          size_t size);
+                          size_t size) ORTHANC_OVERRIDE;
 
-    virtual void Execute(OrthancPluginRestOutput* output);
+    virtual void Execute(OrthancPluginRestOutput* output) ORTHANC_OVERRIDE;
 
     static IChunkedRequestReader* PostCallback(const char* url,
                                                const OrthancPluginHttpRequest* request);
--- a/Plugin/WadoRsRetrieveFrames.cpp	Wed Aug 26 13:22:47 2020 +0200
+++ b/Plugin/WadoRsRetrieveFrames.cpp	Sat Oct 17 18:43:45 2020 +0200
@@ -388,8 +388,6 @@
                                     "Cannot start a multipart answer");
   }
 
-  const std::string base = OrthancPlugins::Configuration::GetBaseUrl(request);
-    
   for (std::list<unsigned int>::const_iterator
          frame = frames.begin(); frame != frames.end(); ++frame)
   {
@@ -402,6 +400,7 @@
     OrthancPluginErrorCode error;
 
 #if HAS_SEND_MULTIPART_ITEM_2 == 1
+    const std::string base = OrthancPlugins::Configuration::GetBaseUrl(request);
     std::string location = (
       OrthancPlugins::Configuration::GetWadoUrl(base, studyInstanceUid, seriesInstanceUid, sopInstanceUid) +
       "frames/" + boost::lexical_cast<std::string>(*frame + 1));
@@ -463,7 +462,7 @@
       if (!Orthanc::LookupTransferSyntax(targetSyntax, instance->GetTransferSyntaxUid()))
       {
         throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented,
-                                        "Unknown transfer syntax: " + targetSyntax);
+                                        "Unknown transfer syntax: " + std::string(GetTransferSyntaxUid(targetSyntax)));
       }
     }
 
--- a/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Wed Aug 26 13:22:47 2020 +0200
+++ b/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake	Sat Oct 17 18:43:45 2020 +0200
@@ -112,6 +112,12 @@
         set(ORTHANC_FRAMEWORK_MD5 "3c171217f930abe80246997bdbcaf7cc")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.2")
         set(ORTHANC_FRAMEWORK_MD5 "328f94dcbd78c169655a13f7ad58a2c2")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.3")
+        set(ORTHANC_FRAMEWORK_MD5 "3f1ba9502ec7c5449971d3b56087bcde")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.7.4")
+        set(ORTHANC_FRAMEWORK_MD5 "19fcb7c21876af86546baa048a22c6c0")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.8.0")
+        set(ORTHANC_FRAMEWORK_MD5 "f8ec7554ef5d23ea4ce474b1e8214de9")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
--- a/Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake	Wed Aug 26 13:22:47 2020 +0200
+++ b/Resources/Orthanc/Toolchains/LinuxStandardBaseToolchain.cmake	Sat Oct 17 18:43:45 2020 +0200
@@ -21,11 +21,11 @@
 #
 # Full build, as used on the BuildBot CIS:
 #
-#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -DENABLE_PKCS11=ON -G Ninja
+#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake ../OrthancServer/ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu -DENABLE_PKCS11=ON -G Ninja
 #
 # Or, more lightweight version (without libp11 and ICU):
 #
-#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -G Ninja
+#   $ LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake ../OrthancServer/ -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../OrthancFramework/Resources/Toolchains/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -G Ninja
 #
 
 INCLUDE(CMakeForceCompiler)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Resources/RunCppCheck.sh	Sat Oct 17 18:43:45 2020 +0200
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+set -ex
+
+CPPCHECK=cppcheck
+
+if [ $# -ge 1 ]; then
+    CPPCHECK=$1
+fi
+
+cat <<EOF > /tmp/cppcheck-suppressions.txt
+unusedFunction
+EOF
+
+${CPPCHECK} --enable=all --quiet --std=c++11 \
+            --suppressions-list=/tmp/cppcheck-suppressions.txt \
+            -DHAS_ORTHANC_EXCEPTION=1 \
+            -DORTHANC_BUILDING_FRAMEWORK_LIBRARY=1 \
+            -DORTHANC_ENABLE_BASE64=1 \
+            -DORTHANC_ENABLE_CIVETWEB=0 \
+            -DORTHANC_ENABLE_CURL=1 \
+            -DORTHANC_ENABLE_DCMTK=1 \
+            -DORTHANC_ENABLE_DCMTK_JPEG=1 \
+            -DORTHANC_ENABLE_DCMTK_JPEG_LOSSLESS=1 \
+            -DORTHANC_ENABLE_GLEW=1 \
+            -DORTHANC_ENABLE_JPEG=1 \
+            -DORTHANC_ENABLE_LOCALE=1 \
+            -DORTHANC_ENABLE_LOGGING=1 \
+            -DORTHANC_ENABLE_LOGGING_STDIO=1 \
+            -DORTHANC_ENABLE_MD5=1 \
+            -DORTHANC_ENABLE_MONGOOSE=0 \
+            -DORTHANC_ENABLE_OPENGL=1 \
+            -DORTHANC_ENABLE_PKCS11=0 \
+            -DORTHANC_ENABLE_PNG=1 \
+            -DORTHANC_ENABLE_PUGIXML=0 \
+            -DORTHANC_ENABLE_SDL=1 \
+            -DORTHANC_ENABLE_SSL=1 \
+            -DORTHANC_ENABLE_THREADS=1 \
+            -DORTHANC_ENABLE_WASM=1 \
+            -DORTHANC_ENABLE_ZLIB=1 \
+            -DORTHANC_SANDBOXED=0 \
+            -D__GNUC__ \
+            -D__cplusplus=201103 \
+            -D__linux__ \
+            -DEM_ASM \
+            -UNDEBUG \
+            -I/home/jodogne/Subversion/orthanc/OrthancFramework/Sources \
+            -I/home/jodogne/Subversion/orthanc/OrthancServer/Plugins/Include/ \
+            \
+            ../Plugin \
+            ../UnitTestsSources \
+            \
+            2>&1