# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1583309194 -3600
# Node ID 9b0e7a4b6749da0561e5e33b6aea56d59a6b58f6
# Parent  4a8fcfe2bbc78fd385deffd67167cda582b30b16
cppcheck

diff -r 4a8fcfe2bbc7 -r 9b0e7a4b6749 Plugin/WadoRs.cpp
--- a/Plugin/WadoRs.cpp	Wed Mar 04 08:54:51 2020 +0100
+++ b/Plugin/WadoRs.cpp	Wed Mar 04 09:06:34 2020 +0100
@@ -34,7 +34,8 @@
 
 
 static const char* const MAIN_DICOM_TAGS = "MainDicomTags";
-
+static const char* const INSTANCES = "Instances";
+static const char* const PATIENT_MAIN_DICOM_TAGS = "PatientMainDicomTags";
 
 
 static std::string GetResourceUri(Orthanc::ResourceType level,
@@ -336,7 +337,7 @@
         std::string maxValue = current->first;
         size_t maxCount = current->second;
 
-        current++;
+        ++current;
 
         while (current != counters.end())
         {
@@ -346,7 +347,7 @@
             maxCount = current->second;
           }
             
-          current++;
+          ++current;
         }
 
         // Take the ceiling of the number of available instances
@@ -380,9 +381,6 @@
                              const std::string& orthancId,
                              Orthanc::ResourceType level)
     {
-      static const char* INSTANCES = "Instances";
-      static const char* PATIENT_MAIN_DICOM_TAGS = "PatientMainDicomTags";
-        
       std::string uri;
       std::string parentField;
 
diff -r 4a8fcfe2bbc7 -r 9b0e7a4b6749 Plugin/WadoRsRetrieveRendered.cpp
--- a/Plugin/WadoRsRetrieveRendered.cpp	Wed Mar 04 08:54:51 2020 +0100
+++ b/Plugin/WadoRsRetrieveRendered.cpp	Wed Mar 04 09:06:34 2020 +0100
@@ -106,7 +106,7 @@
     }
     
   public:
-    RenderingParameters(const OrthancPluginHttpRequest* request) :
+    explicit RenderingParameters(const OrthancPluginHttpRequest* request) :
       hasViewport_(false),
       hasQuality_(false),
       hasWindowing_(false),
diff -r 4a8fcfe2bbc7 -r 9b0e7a4b6749 Resources/Orthanc/Sdk-1.5.7/orthanc/OrthancCPlugin.h
--- a/Resources/Orthanc/Sdk-1.5.7/orthanc/OrthancCPlugin.h	Wed Mar 04 08:54:51 2020 +0100
+++ b/Resources/Orthanc/Sdk-1.5.7/orthanc/OrthancCPlugin.h	Wed Mar 04 09:06:34 2020 +0100
@@ -77,7 +77,7 @@
  * Orthanc - A Lightweight, RESTful DICOM Store
  * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
  * Department, University Hospital of Liege, Belgium
- * Copyright (C) 2017-2020 Osimis S.A., Belgium
+ * Copyright (C) 2017-2019 Osimis S.A., Belgium
  *
  * This program is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as