diff OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.cpp @ 1571:85e117739eca

cppcheck
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 21 Sep 2020 17:46:39 +0200
parents e731e62692a9
children 4fb8fdf03314
line wrap: on
line diff
--- a/OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.cpp	Mon Sep 21 14:50:26 2020 +0200
+++ b/OrthancStone/Sources/Loaders/SeriesThumbnailsLoader.cpp	Mon Sep 21 17:46:39 2020 +0200
@@ -226,7 +226,7 @@
     }
 
     virtual void HandleSuccess(const std::string& body,
-                               const std::map<std::string, std::string>& headers)
+                               const std::map<std::string, std::string>& headers) ORTHANC_OVERRIDE
     {
       Json::Reader reader;
       Json::Value value;
@@ -281,7 +281,7 @@
     }
 
     virtual void HandleSuccess(const std::string& body,
-                               const std::map<std::string, std::string>& headers)
+                               const std::map<std::string, std::string>& headers) ORTHANC_OVERRIDE
     {
       std::string mime = Orthanc::MIME_JPEG;
       for (std::map<std::string, std::string>::const_iterator
@@ -297,7 +297,7 @@
                                     GetSeriesInstanceUid(), new Thumbnail(body, mime));
     }
 
-    virtual void HandleError()
+    virtual void HandleError() ORTHANC_OVERRIDE
     {
       // The DICOMweb wasn't able to generate a thumbnail, try to
       // retrieve the SopClassUID tag using QIDO-RS
@@ -367,7 +367,7 @@
     }
 
     virtual void HandleSuccess(const std::string& body,
-                               const std::map<std::string, std::string>& headers)
+                               const std::map<std::string, std::string>& headers) ORTHANC_OVERRIDE
     {
       SeriesThumbnailType type = ExtractSopClassUid(body);
 
@@ -402,7 +402,7 @@
     }
 
     virtual void HandleSuccess(const std::string& body,
-                               const std::map<std::string, std::string>& headers)
+                               const std::map<std::string, std::string>& headers) ORTHANC_OVERRIDE
     {
       static const char* const INSTANCES = "Instances";
       
@@ -422,10 +422,6 @@
         Json::Value::ArrayIndex index = json[INSTANCES].size() / 2;
         if (json[INSTANCES][index].type() == Json::stringValue)
         {
-          std::map<std::string, std::string> arguments, headers;
-          arguments["quality"] = boost::lexical_cast<std::string>(JPEG_QUALITY);
-          headers["Accept"] = Orthanc::MIME_JPEG;
-
           const std::string instance = json[INSTANCES][index].asString();
 
           std::unique_ptr<OrthancRestApiCommand> command(new OrthancRestApiCommand);
@@ -453,7 +449,7 @@
     }
 
     virtual void HandleSuccess(const std::string& body,
-                               const std::map<std::string, std::string>& headers)
+                               const std::map<std::string, std::string>& headers) ORTHANC_OVERRIDE
     {
       Json::Value json;
       Json::Reader reader;
@@ -630,8 +626,9 @@
   }
     
   
-  boost::shared_ptr<SeriesThumbnailsLoader> SeriesThumbnailsLoader::Create(ILoadersContext::ILock& stone,
-                                                                           int priority)
+  boost::shared_ptr<SeriesThumbnailsLoader> SeriesThumbnailsLoader::Create(
+    const ILoadersContext::ILock& stone,
+    int priority)
   {
     boost::shared_ptr<SeriesThumbnailsLoader> result(new SeriesThumbnailsLoader(stone.GetContext(), priority));
     result->Register<GetOrthancImageCommand::SuccessMessage>(stone.GetOracleObservable(), &SeriesThumbnailsLoader::Handle);
@@ -650,8 +647,8 @@
   void SeriesThumbnailsLoader::SetThumbnailSize(unsigned int width,
                                                 unsigned int height)
   {
-    if (width <= 0 ||
-        height <= 0)
+    if (width == 0 ||
+        height == 0)
     {
       throw Orthanc::OrthancException(Orthanc::ErrorCode_ParameterOutOfRange);
     }