Mercurial > hg > orthanc-stone

changeset 1150:7aad0984d38a broker

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 15 Nov 2019 12:38:15 +0100
parents 2da8b4d6f8c1
children 48befc2bf66d
files Framework/Oracle/GenericOracleRunner.cpp Framework/Oracle/GenericOracleRunner.h Framework/Oracle/ThreadedOracle.cpp Framework/Oracle/ThreadedOracle.h
diffstat 4 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/Framework/Oracle/GenericOracleRunner.cpp	Fri Nov 15 12:35:35 2019 +0100
+++ b/Framework/Oracle/GenericOracleRunner.cpp	Fri Nov 15 12:38:15 2019 +0100
@@ -352,12 +352,12 @@
     private:
       boost::weak_ptr<IObserver> receiver_;
       IMessageEmitter&           emitter_;
-      boost::shared_ptr<ParsedDicomFileCache>  cache_;
+      boost::shared_ptr<ParsedDicomCache>  cache_;
 
     public:
       DicomHandlerWithCache(boost::weak_ptr<IObserver> receiver,
                             IMessageEmitter& emitter,
-                            boost::shared_ptr<ParsedDicomFileCache> cache) :
+                            boost::shared_ptr<ParsedDicomCache> cache) :
         receiver_(receiver),
         emitter_(emitter),
         cache_(cache)
@@ -397,7 +397,7 @@
   
   static void RunInternal(boost::weak_ptr<IObserver> receiver,
                           IMessageEmitter& emitter,
-                          boost::shared_ptr<ParsedDicomFileCache> cache,
+                          boost::shared_ptr<ParsedDicomCache> cache,
                           const std::string& root,
                           const ParseDicomFileCommand& command)
   {
@@ -407,7 +407,7 @@
     if (cache.get())
     {
       {
-        ParsedDicomFileCache::Reader reader(*cache, path);
+        ParsedDicomCache::Reader reader(*cache, path);
         if (reader.IsValid() &&
             (!command.IsPixelDataIncluded() ||
              reader.HasPixelData()))
--- a/Framework/Oracle/GenericOracleRunner.h	Fri Nov 15 12:35:35 2019 +0100
+++ b/Framework/Oracle/GenericOracleRunner.h	Fri Nov 15 12:38:15 2019 +0100
@@ -26,7 +26,7 @@
 #endif
 
 #if ORTHANC_ENABLE_DCMTK == 1
-#  include "../Toolbox/ParsedDicomFileCache.h"
+#  include "../Toolbox/ParsedDicomCache.h"
 #endif
 
 #include "IOracleCommand.h"
@@ -44,7 +44,7 @@
     std::string                    rootDirectory_;
 
 #if ORTHANC_ENABLE_DCMTK == 1
-    boost::shared_ptr<ParsedDicomFileCache>  dicomCache_;
+    boost::shared_ptr<ParsedDicomCache>  dicomCache_;
 #endif
 
   public:
@@ -74,7 +74,7 @@
     }
 
 #if ORTHANC_ENABLE_DCMTK == 1
-    void SetDicomCache(boost::shared_ptr<ParsedDicomFileCache> cache)
+    void SetDicomCache(boost::shared_ptr<ParsedDicomCache> cache)
     {
       dicomCache_ = cache;
     }
--- a/Framework/Oracle/ThreadedOracle.cpp	Fri Nov 15 12:35:35 2019 +0100
+++ b/Framework/Oracle/ThreadedOracle.cpp	Fri Nov 15 12:38:15 2019 +0100
@@ -378,7 +378,7 @@
       }
       else
       {
-        dicomCache_.reset(new ParsedDicomFileCache(size));
+        dicomCache_.reset(new ParsedDicomCache(size));
       }
     }
 #endif
--- a/Framework/Oracle/ThreadedOracle.h	Fri Nov 15 12:35:35 2019 +0100
+++ b/Framework/Oracle/ThreadedOracle.h	Fri Nov 15 12:38:15 2019 +0100
@@ -34,7 +34,7 @@
 #endif
 
 #if ORTHANC_ENABLE_DCMTK == 1
-#  include "../Toolbox/ParsedDicomFileCache.h"
+#  include "../Toolbox/ParsedDicomCache.h"
 #endif
 
 #include "IOracle.h"
@@ -71,7 +71,7 @@
     unsigned int                         sleepingTimeResolution_;
 
 #if ORTHANC_ENABLE_DCMTK == 1
-    boost::shared_ptr<ParsedDicomFileCache>  dicomCache_;
+    boost::shared_ptr<ParsedDicomCache>  dicomCache_;
 #endif
     
     void Step();