Mercurial > hg > orthanc

changeset 3837:963ea9fab402

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 15 Apr 2020 17:28:27 +0200
parents 0c16051dfd56 (diff) cbe847575c62 (current diff)
children 95083d2f6819
files
diffstat 3 files changed, 4 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Core/HttpServer/HttpServer.cpp	Wed Apr 15 16:59:47 2020 +0200
+++ b/Core/HttpServer/HttpServer.cpp	Wed Apr 15 17:28:27 2020 +0200
@@ -170,7 +170,7 @@
 
 
 
-  class ChunkStore
+  class ChunkStore : public boost::noncopyable
   {
   private:
     typedef std::list<ChunkedFile*>  Content;
@@ -308,7 +308,7 @@
                                                   struct mg_connection *connection,
                                                   const std::string& contentLength)
   {
-    int length;      
+    int length;
     try
     {
       length = boost::lexical_cast<int>(contentLength);
@@ -904,7 +904,6 @@
       }
     }
 
-
     if (!found && 
         server.HasHandler())
     {
--- a/OrthancServer/DicomInstanceToStore.h	Wed Apr 15 16:59:47 2020 +0200
+++ b/OrthancServer/DicomInstanceToStore.h	Wed Apr 15 17:28:27 2020 +0200
@@ -44,7 +44,7 @@
 {
   class ParsedDicomFile;
 
-  class DicomInstanceToStore
+  class DicomInstanceToStore : public boost::noncopyable
   {
   public:
     typedef std::map<std::pair<ResourceType, MetadataType>, std::string>  MetadataMap;
--- a/OrthancServer/ServerContext.cpp	Wed Apr 15 16:59:47 2020 +0200
+++ b/OrthancServer/ServerContext.cpp	Wed Apr 15 17:28:27 2020 +0200
@@ -669,7 +669,7 @@
   {
 #if ENABLE_DICOM_CACHE == 0
     static std::unique_ptr<IDynamicObject> p;
-    p.reset(provider_.Provide(instancePublicId));
+    p.reset(that_.provider_.Provide(instancePublicId));
     dicom_ = dynamic_cast<ParsedDicomFile*>(p.get());
 #else
     dicom_ = &dynamic_cast<ParsedDicomFile&>(that_.dicomCache_.Access(instancePublicId));